Sync'd branch integration/b2g-inbound with upstream @ Tue Nov  4 06:34:44 PST 2014