Revert "Revert "Merge pull request #843 from rtfd/merge-1.6""

This reverts commit 3545214c3fba97d15ad3c43478fc4f78a3a44355.