Merge branch 'release/1.1.1' v1.1.1
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 14 Apr 2017 15:20:51 +0000 (11:20 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 14 Apr 2017 15:20:51 +0000 (11:20 -0400)

Trivial merge