Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-10-26 02:01:09 +00:00