v1.3.7: Merge pull request #636 from marci4/master

marci4
2017-12-11T17:09:22Z

Update to 1.3.7