Do not use shorthand ternary operator as it causes errors (connection abort) on QNAP php.
Merge branch 'master' of github.com:magicsunday/webtrees