Sync'd branch integration/b2g-inbound with upstream @ Thu Oct  2 20:19:34 PDT 2014