Sync'd branch integration/b2g-inbound with upstream @ Sat Nov  8 19:04:00 PST 2014