0.9.6: Prep for merge with master, release