Patches:
========
Álvaro Lopes <alvieboy@alvie.com>