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