Sync'd branch integration/b2g-inbound with upstream @ Tue Nov  4 10:19:36 PST 2014