Upstream changes:
* A nice quiet update to the Email Settings page, which may or may not fix an IE8 issue.
* An update that does who-knows-what. I sure as hell cannot make head nor tail of what is going on.
Merge branch 'master' into 2014-skin