Merge branch 'master' into 'metacatalog-0.2'

# Conflicts:
#   README.rst
1 job for metacatalog-0.2 in 0 seconds (queued for 2 seconds)
Status Name Job ID Coverage
  Deploy
failed wps-toolbox #234873

00:00:00

 
Name Stage Failure
failed
wps-toolbox Deploy
Downloading artifacts
Running before_script and script
$ sudo -u vfwtools rm -rf /home/vfwtools/wps-toolbox_old
rm: cannot remove ‘/home/vfwtools/wps-toolbox_old/.git/objects/c0/56917327448407192aebfe7f8af291a96aa630’: Permission denied
rm: cannot remove ‘/home/vfwtools/wps-toolbox_old/.git/objects/50/bf44608483b7effaafed51184d8d629abab082’: Permission denied
rm: cannot remove ‘/home/vfwtools/wps-toolbox_old/.git/objects/b9/cba699d298c6af2801fb49e984109d0aeae764’: Permission denied
Running after_script
Uploading artifacts for failed job
ERROR: Job failed: exit status 1