Sync'd branch projects/holly with upstream @ Thu Oct 16 08:57:13 PDT 2014