Commit 8fe80381 authored by Andreas Marek's avatar Andreas Marek
Browse files

Merge branch 'bugfixes_current_release'

parents c3b05b5f 43d232a1