Merge branch for 0.9.5 version, now on master