Release 0.12.1
Merge branch '0.12'