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