Merge branch 'hotfix/1.0.23' v1.0.23
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Mar 2016 15:32:06 +0000 (11:32 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Mar 2016 15:32:06 +0000 (11:32 -0400)

Trivial merge