Merge pull request #2221 from Rudloff/master