Sync'd branch integration/b2g-inbound with upstream @ Mon Nov  3 16:23:43 PST 2014