Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 30 01:33:41 PDT 2014