Sync'd branch projects/holly with upstream @ Mon Oct 20 12:58:12 PDT 2014