Merge branch 'hotfix/1.2.23' v1.2.23
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 13 Apr 2017 17:50:56 +0000 (13:50 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 13 Apr 2017 17:50:56 +0000 (13:50 -0400)

Trivial merge