Pull changes from OpenBSD as of 2013-05-24