Merge branch 'hotfix/1.0.5'
authorIan Weller <ian@gaslightmedia.com>
Wed, 18 May 2016 18:22:36 +0000 (14:22 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 18 May 2016 18:22:36 +0000 (14:22 -0400)

Trivial merge