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