Fix ping timeout handling and ignore automake files
Merge remote-tracking branch 'yoyoma2/master'