Merge branch 'hotfix/1.0.23'
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 25 Feb 2016 20:24:56 +0000 (15:24 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 25 Feb 2016 20:24:56 +0000 (15:24 -0500)

Trivial merge