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