Bumped to 0.6.1 - old tag had incorrect version

The 0.6.0 tag had the wrong version string, tagging 0.6.1 with a
matching version string (no other changes).

Change-Id: I031ea4316564f9dc3916fd57b97ab2b97cebd074
Merge branch 'version'