Support 16135, 5.0.5b thanks to mansemino.

Signed-off-by: anuka <david.vas1@gmail.com>
Support 17359. By mansemino. Thanks to him. (:

Signed-off-by: anuka <david.vas1@gmail.com>