Fixing couple small issues
Merge remote-tracking branch 'origin/master'
alpha9
alpha8
Merge remote-tracking branch 'origin/1.X' into 1.X
a6