Sync'd branch integration/b2g-inbound with upstream @ Thu Oct  9 09:16:39 PDT 2014