auto-merge staging into master
Merge remote-tracking branch 'origin/master' into aemysqlc