Sync'd branch integration/b2g-inbound with upstream @ Tue Nov  4 07:03:40 PST 2014