Merge branch 'master' into 2014-skin

Conflicts:
	versions.cfg