Sync'd branch integration/b2g-inbound with upstream @ Tue Nov  4 15:10:46 PST 2014