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