Release 0.9.12 merge to master