Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 23 21:27:12 PDT 2014