Sync'd branch integration/b2g-inbound with upstream @ Thu Oct  9 06:08:44 PDT 2014