Sync'd branch projects/holly with upstream @ Tue Sep 16 19:45:32 PDT 2014