Merge branch 'release/2.9.14' v2.9.14
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 5 Apr 2017 12:43:13 +0000 (08:43 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 5 Apr 2017 12:43:13 +0000 (08:43 -0400)

Trivial merge