Sync'd branch projects/holly with upstream @ Mon Oct  6 08:46:08 PDT 2014