Merge pull request #1089 from obsy/master