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