Merge branch 'release/1.0.2' v1.0.2
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 1 Dec 2015 15:36:31 +0000 (10:36 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 1 Dec 2015 15:36:31 +0000 (10:36 -0500)

Trivial merge