KeyError fixed
Merge remote-tracking branch 'egbert/anontunnel' into devel
Merge remote-tracking branch 'chris/devel' into anontunnel