Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 30 11:28:39 PDT 2014