Sync'd branch projects/gum with upstream @ Fri Oct 24 18:07:10 PDT 2014