*8183* Port pull request #36 from MichaelThessel/ojs-stable-2_4 to master