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