Merge branch 'hotfix/1.1.0' v1.1.0
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 28 Jul 2017 18:53:33 +0000 (14:53 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 28 Jul 2017 18:53:33 +0000 (14:53 -0400)

Trivial merge