Sync'd branch projects/holly with upstream @ Fri Sep 26 12:39:07 PDT 2014