Bug Fixes

See ChangeLog.txt