Merge branch 'master' into ueno-pss
Solved conflicts: cipher/ChangeLog cipher/pubkey.c tests/ChangeLog tests/basic.c