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