1.6.0

The pull request tracks the 1.6.0 release which contains #525 and #589