Commit 73838874 authored by Andreas Marek's avatar Andreas Marek

Merge branch 'bugfixes_current_release'

parents fffcad08 60a538e0