Merge generalification into my stable6 branch