Merge remote-tracking branch 'origin/master' into eddie/fix_1262