Merge branch 'hotfix/2.9.8' v2.9.8
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 27 Feb 2017 19:48:33 +0000 (14:48 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 27 Feb 2017 19:48:33 +0000 (14:48 -0500)

Trivial merge