tree 05dddecb67ecd14544ea06849c02b70e980d0895
parent 7e8d39ddff8df24a02526457e1bea468d79c83b9
parent 52db181eb196ebf1e489778df254460d2cfae603
author Bobby R. Bruce <bbruce@ucdavis.edu> 1659042536 -0700
committer Bobby R. Bruce <bbruce@ucdavis.edu> 1659124434 -0700

resources: Merge branch 'stable' into develop

This is done periodically as stable can be updated at any time, though
these changes should also be available on the develop branch.

Change-Id: I6767ae43e0c2e258291ace67d711faac45f50496