local commit
Merge branch 'version' of https://github.com/standpoint/ongoing into version
Merge remote-tracking branch 'origin/version' into version