bug #3961 Avoid Suhosin warning when in simulation mode
Merge branch 'QA_4_0'