Sync'd branch projects/holly with upstream @ Wed Oct 29 22:31:12 PDT 2014