[-] fix issue#6
Merge remote-tracking branch 'origin/testing'

Conflicts:
	phpmodule/cm.cc