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