Merge branch 'hotfix/1.0.1' v1.0.1
authorIan Weller <ian@gaslightmedia.com>
Thu, 12 May 2016 16:46:45 +0000 (12:46 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 12 May 2016 16:46:45 +0000 (12:46 -0400)

Trivial merge