Merge remote-tracking branch 'pactive/master'

Conflicts:
	latest-devel/plasma-active-latest-devel.yaml