Pull changes from OpenBSD as of 2013-10-23