Merge tag 'v2.9.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Feb 2017 13:46:57 +0000 (08:46 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Feb 2017 13:46:57 +0000 (08:46 -0500)
Version 2.9.5


Trivial merge