Pull the fix from rev 1.31.2.1; i've accidentally committed it to 2.2 first.
Pull the fix from rev 1.31.2.1; i've accidentally committed it to
2.2 first.

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase