Merge branch 'release-0.3.0'
Merge branch 'release-0.3.1'
Merge branch 'release-0.3.2'
Merge branch 'release-0.3.3'

Conflicts:
	VERSION
Merge branch 'release-0.3.4'

Conflicts:
	VERSION
Merge branch 'release-0.3.5'
Missing version bump in the setup py
Merge branch 'master' into develop