Pull changes from OpenBSD as of 2014-08-10
Merge branch 'OpenBSD'