Merge branch 'hotfix/2.9.10' v2.9.10
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 8 Mar 2017 21:03:21 +0000 (16:03 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 8 Mar 2017 21:03:21 +0000 (16:03 -0500)

Trivial merge