Sync'd branch projects/holly with upstream @ Mon Oct 27 13:56:18 PDT 2014