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