add A3
XMerge remote-tracking branch 'origin/master'

Conflicts:
	src/CForwarderMonitor.cpp