Merge pull request #1342 from nevion:master