tree 7e6580d84f536e808160ab2a19a3025babb21fa3
parent e68fedaad1946e23638b5e2030e552942a1f6b78
parent cb33a4f7ddd429fedf9e6e727213c654a26cf66f
author Bobby R. Bruce <bbruce@ucdavis.edu> 1606364392 -0800
committer Bobby R. Bruce <bbruce@ucdavis.edu> 1606364458 -0800

website: Merge branch 'stable' into develop

This is done periodically to keep develop up-to-date with improvements
on stable.

Change-Id: Ic2164dc91b14777e46c97fdc89806d75af5784aa