X509 does not build with other patches
Merge branch '5.8p2'

* 5.8p2:
  X509 does not build with other patches

Conflicts:
	Makefile