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