Merge pull request #1041 from josbeir/5.x #614

Job	Run time
cs-stan / Coding Standard & Static Analysis	31s
testsuite / testsuite-linux (8.1, sqlite, lowest, false)	34s
testsuite / testsuite-linux (8.1, pgsql, highest, false)	40s
testsuite / testsuite-linux (8.3, sqlite, highest, false)	30s
testsuite / testsuite-linux (8.1, mysql, highest, false)	57s
testsuite / testsuite-linux (8.2, mysql, false)	40s
testsuite / testsuite-linux (8.4, mysql, highest, false)	49s
	4m 41s

Provide feedback