Sync'd branch integration/b2g-inbound with upstream @ Thu Nov 13 00:15:10 PST 2014