v0.9.6
ad61989b · Merge pull request #861 from skriss/v0.9.6-cherrypicks ·