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