Merge branch 'release/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Jan 2017 18:01:02 +0000 (13:01 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Jan 2017 18:01:02 +0000 (13:01 -0500)

Trivial merge