Merge branch 'master' into 'master'

Remove tmp/.gitkeep

This file is obsolete since 5b4aba5f as it exists
solely for the directory to exist.

See merge request !1506