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