Merge pull request #1156 from felfert/master