Lost this in cd109127cad; #2399
Merge pull request #2409 from gittip/bring-back-fee-cap

Lost this in cd109127cad; #2399