Merge branch 'hotfix/1.0.1' v1.0.1
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 18 Mar 2016 20:42:20 +0000 (16:42 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 18 Mar 2016 20:42:20 +0000 (16:42 -0400)

Trivial merge