Update q to ~0.9.6
Merge branch 'q-0.9'