Merge branch 'master' into develop
Giving up. Requirements are now in setup.py in install_requires.
Remove unused code from setup.py script.
Merge branch 'release/1.1.6'