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