Fixes #6
Merge branch '5-1-stable' of github.com:ArthurHoaro/Public-GitLab into 5-1-stable