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