merge from latest mono-tool's gendarme