Merge branch 'hotfix/2.9.4' v2.9.4
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 24 Jan 2017 15:03:29 +0000 (10:03 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 24 Jan 2017 15:03:29 +0000 (10:03 -0500)

Trivial merge