Merge branch 'string_fixes' into 'master'

String fixes

See merge request futility/Futility!351
1 job for master in 2 minutes and 15 seconds (queued for 4 seconds)