block by drnic 5824112

5824112

patch.diff