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