Merge trunk through 1197

git-svn-id: http://acl2-devel.googlecode.com/svn/branches/centaur@1198 5d84a466-a78b-0930-a311-59b22171a541