15.64, various fixes from bugs reports on our ticket system.
Merge remote-tracking branch 'tukz/master'
updated