Merge branch 'master' into deploy.gibson