Merge remote-tracking branch 'origin/1.3bug_fixes_live'
Merge remote-tracking branch 'origin/master' into 1.3bug_fixes_live