Merge development into ngwpc-candidate for release 3.1.2.1.0-rc1#15

cmaynard-ngwpc merged 1 commit intongwpc-candidateNGWPC/cfe:ngwpc-candidatefrom

developmentNGWPC/cfe:developmentCopy head branch name to clipboard