Merge branch 'master' into revert_110214