Merge branch 'release/1.2.23' master v1.2.23
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 23 May 2018 19:38:25 +0000 (15:38 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 23 May 2018 19:38:25 +0000 (15:38 -0400)

Trivial merge