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