Merge remote-tracking branch 'scott/master' into merge