Pull changes from OpenBSD as of 2014-07-30