Merge remote-tracking branch 'corentin/master' into crc_update

Conflicts:
	src/luftboot.c (reverted from commit 1836fd096b0d6a7f536399dc76837620eafde59d)