Merge branch 'scygan_astc_fix' into 'master'