sigma final->alt+sigma
Merge branch 'master' into apparat