Merge branch 'hotfix/1.0.1' v1.0.1
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Dec 2016 19:39:30 +0000 (14:39 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Dec 2016 19:39:30 +0000 (14:39 -0500)

Trivial merge