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