Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 23 11:15:13 PDT 2014