Sync'd branch integration/b2g-inbound with upstream @ Tue Nov 11 15:35:02 PST 2014