Added handler for pollMachinesEvent in Tap
Merge remote-tracking branch 'origin/master'