Merged changes from rwjsoftware.