?
Merge branch 'master' into JP

Conflicts:
	bin/.gitignore