Merge commit 'pianohacker-koha/prefs-submit' into master