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