Bugfix#53468: Amendments made in order to compile against FOPv1.1. Based on work by Matthias Reischenbacher.