Sync'd branch projects/holly with upstream @ Wed Oct  8 15:26:15 PDT 2014