Merge branch 'hotfix/1.0.23' v1.0.23
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Mar 2015 16:27:19 +0000 (12:27 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Mar 2015 16:27:19 +0000 (12:27 -0400)

Trivial merge