Merge origin/master VRAI

Conflicts:
	test/kernel/DatabaseTest.java
Merge origin/master