Backports commit 9837baa99717c7526e4bae9c68e8728dea4af183 Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 43221