Sync'd branch projects/holly with upstream @ Wed Oct 29 14:55:26 PDT 2014