Merge branch 'hotfix/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Nov 2016 17:46:47 +0000 (12:46 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Nov 2016 17:46:47 +0000 (12:46 -0500)

Trivial merge