3.1.5 minor fixes

Author git <vivec@telvanni.eu>
Author date 2018-04-22 22:28:29
Author local date 2018-04-23 00:28:29 +0200
Committer git <vivec@telvanni.eu>
Committer date 2018-04-22 22:28:29
Committer local date 2018-04-23 00:28:29 +0200
Commit 39bedea4206705da64087c4730b80126b11bd6ca
Tree 1460c4acc37898a0fe9def35cfd067af3716a8b8
Parent 8f09cd57fc02159d7744ac5a2208a3e7f1d2ed3a
3.1.5 minor fixes