Merge branch 'master' into travis2
Merge branch 'travis2' into travis