Merge branch 'master', remote-tracking branch 'upstream' into topic/styling-cleanup