bump version number to 0.9.6
Merge remote-tracking branch 'upstream/master'