Merge ReWrite by Hugo Posnic

Merged Philip Müller requested to merge Huluti:master into master

Created by: philmmanjaro

Merge request reports