Merge development into ngwpc-candidate for release 3.1.2.2.0-rc1#16

cmaynard-ngwpc merged 8 commits into

ngwpc-candidateNGWPC/LGAR-C:ngwpc-candidatefrom

developmentNGWPC/LGAR-C:developmentCopy head branch name to clipboard