Applied changes from master that apparently got left behind somewhere.