Merge remote-tracking branch 'origin/master' into develop
Updated ChangeLog.
Fixed travis.
Merge branch 'develop'