Update to release 0.6.1
Merge branch 'refs/heads/mackup'

* refs/heads/mackup:
  Update to release 0.6.1