Merge pull request #1090 from dennisjackson/master

patrick-canterino.de