blbost 2
Merge branch 'master' into mojabranch

Conflicts:
	LICENSE