Bug 1278182 Familypage - lines connecting mother to one-parent grand-parents
Merge branch 'master' of https://github.com/fisharebest/webtrees
wrong name for lock file
Batch update / search+replace doesn't match multi-byte wildcards correctly
Attempt to reset timeout limit during upgrade
Merge branch 'webtrees-base/master'