Merge branch 'hotfix/1.2.60' v1.2.60
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 25 Mar 2019 20:40:40 +0000 (16:40 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 25 Mar 2019 20:40:40 +0000 (16:40 -0400)

Trivial merge