Merge branch 'release/1.1.1' into develop
Update PEP8 to version 1.4.6 and Pyflakes to version 0.7.3
Update version
Merge branch 'release/1.2.0'