Sync'd branch integration/b2g-inbound with upstream @ Tue Nov  4 21:58:39 PST 2014