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