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