Merge branch 'release/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 10 May 2017 20:18:33 +0000 (16:18 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 10 May 2017 20:18:33 +0000 (16:18 -0400)

Trivial merge