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