Merge branch 'hotfix/1.5.23' v1.5.23
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Apr 2016 17:59:32 +0000 (13:59 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Apr 2016 17:59:32 +0000 (13:59 -0400)

Trivial merge