Merge changes from 0.9.7-stable
1 file changed