Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 16 23:33:46 PDT 2014