apply post-1.12.0 fixes, bump version to 1.12.1

10 files changed