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