Merge branch 'master' into responsive, strategy=ours