Merge branch 'release/1.1.0'
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jan 2016 19:41:00 +0000 (14:41 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jan 2016 19:41:00 +0000 (14:41 -0500)

Trivial merge