Merge remote-tracking branch 'origin/release-1_8' into release-1_8
Merge remote-tracking branch 'mygithub/release-1_8' into release-1_8