Woof, patch

... so, maybe lets try not to do this ever.
Merge branch 'Amorano-master'