Pull in request #312