Merge branch 'hotfix/1.0.2' v1.0.2
authorIan Weller <ian@gaslightmedia.com>
Thu, 2 Feb 2017 19:36:55 +0000 (14:36 -0500)
committerIan Weller <ian@gaslightmedia.com>
Thu, 2 Feb 2017 19:36:55 +0000 (14:36 -0500)

Trivial merge