Merge branch 'release/1.1.23' v1.1.23
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Dec 2017 13:54:01 +0000 (08:54 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Dec 2017 13:54:01 +0000 (08:54 -0500)

Trivial merge