Merge branch 'develop'
Fix travis build
Fix python 3.2 travis build