After Ebola, WHO to set up contingency fund, develop “surge capacity”