Merging in changes from community into ragerdl acl2