patched to Orchard 1.6.1