Fixes bug #394
Merge branch '394_fix_ping' into devel