Merge branch 'release/2.9.16' v2.9.16
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 25 May 2017 15:38:14 +0000 (11:38 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 25 May 2017 15:38:14 +0000 (11:38 -0400)

Trivial merge