Commit 2c0041c1 authored by Ivaria's avatar Ivaria

Merge branch 'smallpatch' into 'master'

Smallpatch

Closes #341

See merge request !37
parents bb88c7bb 3f9abf59