ex4
moved to proper dir
Merge branch 'master' into 'master'

Master

ex4
Merge branch 'master' into master-gitlab