Merge branch 'hotfix/1.2.23' v1.2.23
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Jul 2016 12:11:59 +0000 (08:11 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Jul 2016 12:11:59 +0000 (08:11 -0400)

Trivial merge