Merge tag 'v2.9.6' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Feb 2017 16:49:02 +0000 (11:49 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Feb 2017 16:49:02 +0000 (11:49 -0500)
Version 2.9.6


Trivial merge