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