Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 31 22:04:34 PDT 2014