Merge branch 'hotfix/1.0.2' v1.0.2
authorIan Weller <ian@gaslightmedia.com>
Wed, 27 Jul 2016 18:36:08 +0000 (14:36 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 27 Jul 2016 18:36:08 +0000 (14:36 -0400)

Trivial merge