Merge branch 'hotfix/1.0.23' v1.0.23
authorIan Weller <ian@gaslightmedia.com>
Fri, 23 Sep 2016 14:36:05 +0000 (10:36 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 23 Sep 2016 14:36:05 +0000 (10:36 -0400)

Trivial merge