Merge remote-tracking branch 'origin/koha_ffzg' into koha_ffzg_2019-03-26