Sync'd branch projects/holly with upstream @ Wed Sep  3 14:36:09 PDT 2014