v1.3.6: Merge pull request #604 from marci4/master

marci4
2017-11-09T18:15:09Z

Update to 1.3.6