Merge latest changes from forrestv:p2pool