Merge branch 'release/2.9.6' v2.9.6
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Feb 2017 16:48:50 +0000 (11:48 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Feb 2017 16:48:50 +0000 (11:48 -0500)

Trivial merge