Merge pull request #1046 from josbeir/5.x #632

Job	Run time
cs-stan / Coding Standard & Static Analysis	30s
testsuite / testsuite-linux (8.2, sqlite, lowest, false)	35s
testsuite / testsuite-linux (8.2, pgsql, highest, false)	38s
testsuite / testsuite-linux (8.3, sqlite, highest, false)	41s
testsuite / testsuite-linux (8.4, mysql, highest, false)	48s
testsuite / testsuite-linux (8.2, mysql, highest, false)	51s
	4m 3s

Provide feedback