Merge remote-tracking branch 'azatoth/master'

Conflicts:
	modules/twinklearv.js
	modules/twinklewarn.js
morebits: reverted 19690a8 as per usage in speedy module

Also cherry-picked 9f11520.