Merge branch '3.5.0' into 3.6.0
authorShane <shane94@hotmail.com>
Wed, 13 Feb 2019 15:31:49 +0000 (10:31 -0500)
committerShane <shane94@hotmail.com>
Wed, 13 Feb 2019 15:31:49 +0000 (10:31 -0500)

Trivial merge