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