Merge branch 'master' of https://gitlab.irap.omp.eu/guitastrolib/guitastro

# Conflicts:
#	src/guitastro/filenames.py