Merge branch 'hotfix/1.0.1'
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Feb 2016 17:42:21 +0000 (12:42 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Feb 2016 17:42:21 +0000 (12:42 -0500)

Trivial merge