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