Merge branch 'master' into x86_64

Conflicts:
	headers/posix/arch/x86_64/arch_setjmp.h
	src/system/kernel/cache/block_cache.cpp

src/tools/fs_shell/block_cache.cpp

@@ -927,7 +927,7 @@ write_cached_block(block_cache* cache, cached_block* block,
 			}
 		}
 	}
-	if (block->transaction == NULL && block->ref_count == 0) {
+	if (block->transaction == NULL && block->ref_count == 0 && !block->unused) {
 		// the block is no longer used
 		block->unused = true;
 		cache->unused_blocks.Add(block);