branches: 1.3.2;use long constant
copy&pasto
Add missing catanh variant (and readd it to the Makefile list)