Fix #152: Properly check for loop in serf wait chain
Merge remote-tracking branch 'upstream/master'