Update to version 13.2.1
Merge branch 'master' into asm