adding changes from openacs 5.8.1 release