Merge branch 'release/1.0.2' v1.0.2
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 29 Aug 2016 18:29:25 +0000 (14:29 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 29 Aug 2016 18:29:25 +0000 (14:29 -0400)

Trivial merge