Merge branch 'hotfix/1.0.5' v1.0.5
authorIan Weller <ian@gaslightmedia.com>
Thu, 23 Jun 2016 19:25:48 +0000 (15:25 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 23 Jun 2016 19:25:48 +0000 (15:25 -0400)

Trivial merge