Merge branch 'hotfix/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 13 Jan 2016 18:22:07 +0000 (13:22 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 13 Jan 2016 18:22:07 +0000 (13:22 -0500)

Trivial merge