Merge pull request #2023 from juergenhoetzel/master