Import Toby Goodwin's v1.7.2 changes (http://www.tobold.org/article/rc)