Merge branch 'master' into travis
This tag has no release notes.