Merge remote-tracking branch 'origin/master'

Conflicts:
	Source/diy.js

TRY
Merge remote-tracking branch 'origin/master'

Conflicts:
	Source/diy.js