Merge remote branch 'ddiss/master_pmda_and_client_timeouts'