Sync'd branch integration/b2g-inbound with upstream @ Thu Oct  9 17:12:45 PDT 2014