Merge branch 'master' into develop
Coverity fixes for freebsd
fix patch
don't object to {T:title/%14s}
Merge branch 'develop'