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