Sync'd branch projects/holly with upstream @ Wed Aug 27 19:01:04 PDT 2014