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