Signed-off-by: Simon Schampijer <simon@schampijer.de> [squashed two patches into one] Signed-off-by: Sascha Silbe <silbe@activitycentral.com>