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