Recommit the non-broken parts of 1.34 and 1.37. Change the type and name of a variable introduced in 1.33.
Recommit the non-broken parts of 1.34 and 1.37.
Change the type and name of a variable introduced in 1.33.

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