Remove version on branch
Merge branch 'refs/heads/develop'

Conflicts:
	version.py