Revert "Revert "Mash up 1.4.1c""

This reverts commit fa8a7f52f9f55b523c690a6c26ad440e1045dab4.