Sync'd branch integration/b2g-inbound with upstream @ Mon Nov  3 09:10:54 PST 2014