Small fix on fix
Merge remote-tracking branch 'chris/devel' into anontunnel