Merge branch 'release/1.0.6' into develop
Enable Travis
Enable Travis
Merge branch 'release/1.0.7'