Release 0.7.11 merge to master

Part of #890