Merge in lad1337's SabPoller