Merge branch 'release/1.1.16' v1.1.16
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 2 Sep 2016 16:50:10 +0000 (12:50 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 2 Sep 2016 16:50:10 +0000 (12:50 -0400)

Trivial merge