Release 0.99.7
Merge branch 'quickrelease'