Updating master with MR!263 contents
FYI @ibelyaev. I tried a cherry-pick (as usual) of MR!263 from 2018-patches to master but GitLab complained. I just did things manually and locally, to get this ticked off.
Please be advised that registry.cern.ch registry (Registry Service) will be unavailable next Monday, March 10th starting at 08:00h (Geneva time) for a short period of time. This may cause temporary disruptions to your workflows. Further information: OTG0154905
FYI @ibelyaev. I tried a cherry-pick (as usual) of MR!263 from 2018-patches to master but GitLab complained. I just did things manually and locally, to get this ticked off.