fix build
Merge remote-tracking branch 'origin/develop'

Conflicts:
	src/plugin-chanops.cpp
fix build