Sync'd branch integration/b2g-inbound with upstream @ Tue Nov 11 22:24:00 PST 2014