Merge branch 'hotfix/1.1.3'
I hate the word 'swag'... this is for you, @jhil.
Merge branch 'hotfix/swag' into devel