Merge branch 'release/1.0.6' into develop
fix for deployment suggested by travis-ci #2495
version bump
Merge branch 'release/1.0.7'