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