Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 7b30fd0e1d8bc77f0556181c82f85d046b058f27) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>