Merge branch 'release/1.1.5' into develop
fix tests on python 3.3
Update version
Merge branch 'release/1.1.6'