Version bumped to 1.9.6
Resolving merge conflict