Merge branch 'fix_Overtimes_2018-patches' into '2018-patches'
Fix overtimes 2018 patches
See merge request !1150 (merged)
(cherry picked from commit 97ad496f)
c062e00a Regenerated archives and dbase da6d4241 Fix copyrights 3715a5e6 Fix nightlies test