Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 23 13:59:47 PDT 2014