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

cmaynard-ngwpc merged 15 commits into

ngwpc-candidateNGWPC/lstm:ngwpc-candidatefrom

developmentNGWPC/lstm:developmentCopy head branch name to clipboard