Merge pull request #849 from BenWiederhake/master