Pull changes from OpenBSD as of 2013-11-22