Change-Id: Ia6c929ae64008dcb37695a5358c44096a893e0c4 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>