Various fixes from wooc
Merge branch 'webtrees-base/master'