Merge tag 'v2.9.14' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 5 Apr 2017 12:43:22 +0000 (08:43 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 5 Apr 2017 12:43:22 +0000 (08:43 -0400)
Version 2.9.14


Trivial merge