Merge branch 'hotfix/1.0.2'
authorIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 18:41:07 +0000 (14:41 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 18:41:07 +0000 (14:41 -0400)

Trivial merge