(cherry picked from commit 6e2023ed0574d97f89e800112b5ca6cc84369c4f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>