Merge branch 'rentzsch'

latest commit 8932789af6
Michael Baltaks authored