Sync'd branch integration/b2g-inbound with upstream @ Wed Nov  5 02:18:45 PST 2014