Merge branch 'release/1.1.0' v1.1.0
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Oct 2016 13:46:07 +0000 (09:46 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Oct 2016 13:46:07 +0000 (09:46 -0400)

Trivial merge