Sync'd branch integration/b2g-inbound with upstream @ Mon Nov  3 00:56:46 PST 2014