* merged some bugfixes from HEAD
3 files changed