Merge tag 'v2.9.15' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 2 May 2017 19:22:45 +0000 (15:22 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 2 May 2017 19:22:45 +0000 (15:22 -0400)
Version 2.9.15


Trivial merge