Sync'd branch projects/gum with upstream @ Fri Oct 17 02:40:10 PDT 2014