Change-Id: I3668e8fd6ff9f25fac63a8acad42a98bd471aa79 Reviewed-by: Marco Bubke <marco.bubke@digia.com>