Sync'd branch projects/holly with upstream @ Fri Sep 26 09:54:49 PDT 2014