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