Fix unconstrained axioms
Merge branch 'master' into llvm-trunk