Merge branch 'release/1.0.2' v1.0.2
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 27 Sep 2016 19:26:47 +0000 (15:26 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 27 Sep 2016 19:26:47 +0000 (15:26 -0400)

Trivial merge