Merge branch 'hotfix/1.1.23' v1.1.23
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 20 Jul 2017 19:57:04 +0000 (15:57 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 20 Jul 2017 19:57:04 +0000 (15:57 -0400)

Trivial merge