Merge branch '3.6.0' into 4.0.0
authorShaneN <shane94@hotmail.com>
Tue, 4 Jun 2019 23:49:27 +0000 (17:49 -0600)
committerShaneN <shane94@hotmail.com>
Tue, 4 Jun 2019 23:49:27 +0000 (17:49 -0600)

Trivial merge