Merge branch 'pregmod-master' into 'pregmod-master'

Don't get stuck in a state where a slave is wearing "choosing her own clothes" but isn't allowed to actually choose

See merge request pregmodfan/fc-pregmod!6184