Sync'd branch integration/b2g-inbound with upstream @ Fri Nov  7 09:42:55 PST 2014