Merge branch 'hotfix/1.0.13' v1.0.13
authorIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 16:36:41 +0000 (12:36 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 16:36:41 +0000 (12:36 -0400)

Trivial merge