Sync'd branch integration/b2g-inbound with upstream @ Wed Nov  5 16:20:49 PST 2014