Merge branch 'release/1.1.0' v1.1.0
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 26 Jul 2016 11:50:23 +0000 (07:50 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 26 Jul 2016 11:50:23 +0000 (07:50 -0400)

Trivial merge