Merge branch '5.x' into 5.next #690

Job	Run time
testsuite (8.4, highest)	20s
testsuite (8.2, lowest)	19s
Coding Standard & Static Analysis	29s
	1m 8s

Provide feedback