Upgrade version to 0.9.5

Also last bit of merge fixing - 1.7.10 build!