Attempt at Bug 948883
Merge branch 'master' of https://github.com/mjgreeny/gecko-dev