Merge branch 'release/1.1.0' v1.1.0
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Feb 2016 17:20:43 +0000 (12:20 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Feb 2016 17:20:43 +0000 (12:20 -0500)

Trivial merge