misc: Merge branch version update into develop
authorBobby R. Bruce <bbruce@ucdavis.edu>
Tue, 2 Jun 2020 07:20:23 +0000 (00:20 -0700)
committerBobby R. Bruce <bbruce@ucdavis.edu>
Tue, 2 Jun 2020 07:20:23 +0000 (00:20 -0700)

Trivial merge