Merge pull request #343 from joan2937/master
authorGuy McSwain <guy.mcswain@gmail.com>
Wed, 29 Apr 2020 20:48:08 +0000 (15:48 -0500)
committerGitHub <noreply@github.com>
Wed, 29 Apr 2020 20:48:08 +0000 (15:48 -0500)
Synchronize develop branch with master.


Trivial merge