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