Merge remote-tracking branch 'origin/123' into wsq2

Conflicts:
	Poco/_B_SystemConst.cs
Merge remote-tracking branch 'origin/123' into wsq2

Conflicts:
	Poco/_B_SystemConst.cs
Merge remote-tracking branch 'origin/wsq2' into 123
adds