Merge branch 'hotfix/1.0.2' v1.0.2
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 6 Aug 2015 20:56:19 +0000 (16:56 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 6 Aug 2015 20:56:19 +0000 (16:56 -0400)

Trivial merge