Needs to be done in a major release. Too late for 4.0.0?
Merged using https://svn.apache.org/viewvc?view=revision&revision=1833459