Signed-off-by: Raul Gutierrez Segales <rgs@collabora.co.uk> [split patch into several parts] Signed-off-by: Sascha Silbe <silbe@activitycentral.com>