Merge branch 'release/1.1.0' v1.1.0
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 24 Oct 2016 18:53:54 +0000 (14:53 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 24 Oct 2016 18:53:54 +0000 (14:53 -0400)

Trivial merge