Merge branch 'hotfix/1.2.10' master v1.2.10
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Mar 2018 21:53:07 +0000 (16:53 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Mar 2018 21:53:07 +0000 (16:53 -0500)

Trivial merge