2014.12.07
Merge remote-tracking branch 'origin/master'

Conflicts:
	userButton/09-EncodeToolButton.uc.js