Merge branch 'master' into GUI-additions

See if this works-