Bug 827237 - Wifi: ap list in settings is empty. r=bent
Bug 827330 - 'Windows build error in PluginHangUIParent.cpp', r=bbondy.
Bug 827237 - Followup: Disable settings test. r=me
Back out bug 810644 for now to fix bug 827035, until we manage to fix bug 765780.  r=stuff-is-broken
Bug 812608 - Disable test_metrics_storage.js on Linux32 debug for permaorange timeouts
Bug 826102 - Make IPC geolocation listener never use cached values and never skip a value. r=dougt
Merge mozilla-central to mozilla-inbound