Merge branch 'master' into 'master'

Master update

See merge request !22 (merged)

(cherry picked from commit 3907a9ea)

f4705c35 fixing the problems filter - update e2c2bc70 Merge branch 'master' of gitlab.software.geant.org:edugain/OT/edu-gain-technical-site-tw