Sync'd branch integration/b2g-inbound with upstream @ Mon Nov  3 02:38:50 PST 2014