Merge branch 'release/1.0.2' v1.0.2
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 2 Sep 2015 18:56:07 +0000 (14:56 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 2 Sep 2015 18:56:07 +0000 (14:56 -0400)

Trivial merge