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