Merge commit '40fb876ebe02fb61bfec0b0378522b876eb1a06d'

Conflicts:
	start.js
Merge branch 'original'