Merge branch 'versions/0.7' into dev

Conflicts:
	CHANGES.txt
	CMakeLists.txt
	cmd/hekad/main.go
	docs/source/conf.py
	pipeline/config.go