Sync'd branch projects/gum with upstream @ Fri Oct 10 05:44:21 PDT 2014