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