Merge branch 'release/1.0.1' into develop
Add an upload command to the Makefile.
Tweak travis setup.
Remove a forgotten import.
1.0.2
Merge branch 'release/1.0.2'