Merge branch 'hotfix/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 1 Dec 2016 17:37:18 +0000 (12:37 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 1 Dec 2016 17:37:18 +0000 (12:37 -0500)

Trivial merge