merge Release/3.1.0.0.0 to develop

[wileyj]

changelog and #5538

[obycode]

Is it better to just merge release -> master, then master -> develop?

[wileyj]

Is it better to just merge release -> master, then master -> develop?

i don't feel strongly one way or the other. i think if we did what you propose though, it may reduce potential for conflicts (basically only resolve once).

i can update release docs to reflect this and start using that method for future releases unless anyone else feels strongly for a different approach.

@obycode the downside to this approach (which may be solved by some automation) is that there will be a delay from merging a release branch into develop, since it would first require a merge to master.

[wileyj]

closing in favor of #5550