Rolling 1.6.1.0
Merge remote-tracking branch 'origin/master' into June-Release