Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Nov 2016 18:22:33 +0000 (13:22 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Nov 2016 18:22:33 +0000 (13:22 -0500)

Trivial merge