- A bit missing from the previous commit. The '@'s from the string token must be   stripped before encoding the expansion mode.
- A bit missing from the previous commit. The '@'s from the string token must be
  stripped before encoding the expansion mode.

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