Sync'd branch projects/holly with upstream @ Thu Oct  2 22:52:08 PDT 2014