Merge from jacebrowning/doorstop.