http -> https
Merge branch 'master' into feature/using-released-version

Conflicts:
	CMakeLists.txt