Merge branch 'master' into beta

3.17.x is the new beta

Conflicts:

	ChangeLog
	configure.ac

1 files changed, 1 insertions, 0 deletions

diff --git a/wtp.c b/wtp.c
index d5126268..fcc7589c 100644
--- a/wtp.c
+++ b/wtp.c
@@ -546,6 +546,7 @@ DEFpropSetMeth(wtp, pUsr, void*);
 DEFpropSetMethPTR(wtp, pmutUsr, pthread_mutex_t);
 DEFpropSetMethPTR(wtp, pcondBusy, pthread_cond_t);
 DEFpropSetMethFP(wtp, pfChkStopWrkr, rsRetVal(*pVal)(void*, int));
+DEFpropSetMethFP(wtp, pfRateLimiter, rsRetVal(*pVal)(void*));
 DEFpropSetMethFP(wtp, pfIsIdle, rsRetVal(*pVal)(void*, int));
 DEFpropSetMethFP(wtp, pfDoWork, rsRetVal(*pVal)(void*, void*, int));
 DEFpropSetMethFP(wtp, pfOnIdle, rsRetVal(*pVal)(void*, int));