Merge branch 'master' into drop-travis