Update to version 13.1.0
Merge branch 'master' into asm