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