In an effort to make sure develop and master match, this PR brings in a few commits that were on master but not develop.
To figure out what was missing, I compared master to develop, and cherry-picked every non-merge commit that showed up in the comparison. Only these three were previously not cherry-picked.
Testing instructions
Compare develop to master and verify that only these changes were missing.
Overview
In an effort to make sure
developandmastermatch, this PR brings in a few commits that were onmasterbut notdevelop.To figure out what was missing, I compared
mastertodevelop, and cherry-picked every non-merge commit that showed up in the comparison. Only these three were previously not cherry-picked.Testing instructions
developtomasterand verify that only these changes were missing.