Merge branch 'release/2.9.15' v2.9.15
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 2 May 2017 19:22:37 +0000 (15:22 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 2 May 2017 19:22:37 +0000 (15:22 -0400)

Trivial merge