Sync'd branch integration/b2g-inbound with upstream @ Fri Nov  7 20:59:11 PST 2014