Latest code as manufactured by MSS Code Factory 1.11.12371
Merge branch 'master' of https://github.com/msobkow/net-sourceforge-MSSCodeFactory-CFCore-2-0