Manually merge changes from amishwins (https://github.com/jfree/jfreechart-fse/pull/23)