Sync'd branch integration/b2g-inbound with upstream @ Thu Oct  2 17:58:47 PDT 2014