ported release bugfix to master
2 files changed