merge 2_5_bugfix branch
3 files changed