Pull downstream changes from NAMD CVS