Merge branch 'release/1.0.2' v1.0.2
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 16 Dec 2015 22:04:16 +0000 (17:04 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 16 Dec 2015 22:04:16 +0000 (17:04 -0500)

Trivial merge