Fix build
Merge pull request #743 from xschildw/release-24

Fix build