Sync'd branch integration/b2g-inbound with upstream @ Mon Nov  3 14:00:51 PST 2014