Pull changes from OpenBSD as of 2013-08-22