Sync'd branch integration/b2g-inbound with upstream @ Thu Nov 13 07:34:04 PST 2014