Merge branch 'master' into travis
Update .travis.yml
Add ChangeLog
Merge branch 'travis' into release-0.28
Merge branch 'develop' into release-0.28