Fixes bug #394
Merge remote-tracking branch 'devel/394_fix_ping' into release