Merge branch 'hotfix/2.9.3' v2.9.3
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 24 Jan 2017 13:56:44 +0000 (08:56 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 24 Jan 2017 13:56:44 +0000 (08:56 -0500)

Trivial merge