Sync'd branch integration/b2g-inbound with upstream @ Mon Nov  3 22:49:40 PST 2014