1.6 release with changes from pull request #13