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