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