Sync'd branch integration/b2g-inbound with upstream @ Thu Oct  9 04:49:50 PDT 2014