Merge branch 'master' into dnewman-merge