Little fixes for 1.6.4
Merge remote-tracking branch 'origin/master' into Development