Merge branch 'master' into travis-ci