Sync'd branch integration/b2g-inbound with upstream @ Sat Nov  8 09:14:58 PST 2014