Update from NAMD-CVS 2014-10-13-12:02:48