Backported reversal of af9895d (close #162, ref #132).
Updated changelog.
Prepared 0.6.1 release.