Merge "Update to use released version 0.6.0"