Sync'd branch integration/b2g-inbound with upstream @ Wed Nov  5 05:19:36 PST 2014