Sync'd branch integration/b2g-inbound with upstream @ Tue Nov 11 18:50:04 PST 2014