Merge tag 'v2.9.16' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 25 May 2017 15:38:27 +0000 (11:38 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 25 May 2017 15:38:27 +0000 (11:38 -0400)
Version 2.9.16


Trivial merge