Merge branch 'release_0_9_6'

message to explain why this merge is necessary,