Sync'd branch integration/b2g-inbound with upstream @ Sun Nov  2 18:40:49 PST 2014