Sync'd branch integration/b2g-inbound with upstream @ Fri Nov  7 16:13:46 PST 2014