Merge pull request #2186 from ruediger-stevens/master