Fix build on 5.3.6 an earlier
Merge pull request #562 from bjori/fix-build-on-53

Fix build on 5.3.6 an earlier

* bjori/fix-build-on-53:
  Fix build on 5.3.6 an earlier