Merge pull request #1267 from Rudloff/master