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