Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 13 Dec 2016 16:48:15 +0000 (11:48 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 13 Dec 2016 16:48:15 +0000 (11:48 -0500)

Trivial merge