Sync'd branch projects/holly with upstream @ Fri Oct 31 07:30:12 PDT 2014