Merge branch 'master' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Nov 2018 20:03:53 +0000 (15:03 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Nov 2018 20:03:53 +0000 (15:03 -0500)

Trivial merge