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