99

re-based into separate branches, argh -- would've been nice to know this up-front
NOTE: you'll need to take branch 100 to get a clean -Pqulice for 97 and 99