Update to the latest 'develop' code
Merge remote-tracking branch 'origin/master' into develop
Update to release-0.9.7
Merge remote-tracking branch 'origin/master' into develop
Update version numbers to 0.9.7

Change-Id: I14117bfd6604f7f19f3dbe917cc7ec3b96998b6a