Fix CVE 2013-4495. Note: this patch has been verified as fixing this security hole but has not received other regression testing.
Revert "Fix CVE 2013-4495. Note: this patch has been verified as fixing this security hole but has not received other regression testing."

This reverts commit 64da0af7ed27284f3397081313850bba270593db.
Use Michael Jenning's patch for CVE 2013-4495 instead of the original. This one is being used because 2.5 should face the minimal possible change.
Fix github issue #190. resources used in accounting had a regression creep in. Thanks to konvpalto for reporting the issue and supplying a patch.
Merge remote-tracking branch 'upstream/2.5-dev' into 2.5-surfsara