Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 1 Dec 2016 20:19:13 +0000 (15:19 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 1 Dec 2016 20:19:13 +0000 (15:19 -0500)

Trivial merge