Fixes #276
Merge branch '2.9.x'
Version 2.9.6