Merge branch 'hotfix/1.0.2' v1.0.2
authorIan Weller <ian@gaslightmedia.com>
Tue, 31 May 2016 18:18:13 +0000 (14:18 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 31 May 2016 18:18:13 +0000 (14:18 -0400)

Trivial merge