Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 31 16:18:37 PDT 2014