Merge pull request #1212 from davvid/dev