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