Sync'd branch integration/b2g-inbound with upstream @ Thu Oct  9 20:33:59 PDT 2014