Merge branch 'release/1.1.0' v1.1.0
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 22 Feb 2017 19:38:31 +0000 (14:38 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 22 Feb 2017 19:38:31 +0000 (14:38 -0500)

Trivial merge