Merge branch 'release/1.0.16' v1.0.16
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 24 Oct 2017 19:22:17 +0000 (15:22 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 24 Oct 2017 19:22:17 +0000 (15:22 -0400)

Trivial merge