verified that Embarcadero IDE is still working after recent merge
verified that Embarcadero IDE is still working after recent merge

elventear/rslinac,radiasoft/rslinac,radiasoft/rslinac,elventear/rslinac,radiasoft/rslinac,radiasoft/rslinac,elventear/rslinac,elventear/rslinac,elventear/rslinac,radiasoft/rslinac,elventear/rslinac