Merge branch 'hotfix/1.0.5' v1.0.5
authorIan Weller <ian@gaslightmedia.com>
Thu, 22 Sep 2016 18:30:55 +0000 (14:30 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 22 Sep 2016 18:30:55 +0000 (14:30 -0400)

Trivial merge