Early merge of MG PR 1751. Glad it wasn't just me.