And another merge issue
And another merge issue

AlphaStaxLLC/taiga,ft-/arribasim-dev-tests,OpenSimian/opensimulator,RavenB/opensim,ft-/arribasim-dev-extras,AlphaStaxLLC/taiga,ft-/arribasim-dev-tests,N3X15/VoxelSim,TomDataworks/opensim,BogusCurry/arribasim-dev,M-O-S-E-S/opensim,cdbean/CySim,TomDataworks/opensim,Michelle-Argus/ArribasimExtract,N3X15/VoxelSim,Michelle-Argus/ArribasimExtract,M-O-S-E-S/opensim,justinccdev/opensim,ft-/opensim-optimizations-wip,QuillLittlefeather/opensim-1,BogusCurry/arribasim-dev,Michelle-Argus/ArribasimExtract,allquixotic/opensim-autobackup,BogusCurry/arribasim-dev,ft-/opensim-optimizations-wip,AlphaStaxLLC/taiga,OpenSimian/opensimulator,RavenB/opensim,RavenB/opensim,allquixotic/opensim-autobackup,cdbean/CySim,AlphaStaxLLC/taiga,N3X15/VoxelSim,intari/OpenSimMirror,EriHoss/OpenSim_0.8.2.0_Dev_LibLSLCC,AlphaStaxLLC/taiga,N3X15/VoxelSim,AlphaStaxLLC/taiga,M-O-S-E-S/opensim,bravelittlescientist/opensim-performance,ft-/opensim-optimizations-wip-tests,bravelittlescientist/opensim-performance,OpenSimian/opensimulator,M-O-S-E-S/opensim,ft-/opensim-optimizations-wip-extras,EriHoss/OpenSim_0.8.2.0_Dev_LibLSLCC,justinccdev/opensim,QuillLittlefeather/opensim-1,EriHoss/OpenSim_0.8.2.0_Dev_LibLSLCC,TechplexEngineer/Aurora-Sim,allquixotic/opensim-autobackup,justinccdev/opensim,cdbean/CySim,ft-/opensim-optimizations-wip-tests,AlexRa/opensim-mods-Alex,N3X15/VoxelSim,ft-/opensim-optimizations-wip-extras,TechplexEngineer/Aurora-Sim,QuillLittlefeather/opensim-1,ft-/opensim-optimizations-wip-extras,RavenB/opensim,QuillLittlefeather/opensim-1,ft-/opensim-optimizations-wip,intari/OpenSimMirror,AlexRa/opensim-mods-Alex,OpenSimian/opensimulator,M-O-S-E-S/opensim,AlphaStaxLLC/taiga,cdbean/CySim,TomDataworks/opensim,OpenSimian/opensimulator,Michelle-Argus/ArribasimExtract,intari/OpenSimMirror,rryk/omp-server,rryk/omp-server,ft-/arribasim-dev-tests,ft-/opensim-optimizations-wip-tests,BogusCurry/arribasim-dev,bravelittlescientist/opensim-performance,AlexRa/opensim-mods-Alex,TechplexEngineer/Aurora-Sim,AlexRa/opensim-mods-Alex,intari/OpenSimMirror,M-O-S-E-S/opensim,intari/OpenSimMirror,cdbean/CySim,RavenB/opensim,ft-/opensim-optimizations-wip-extras,ft-/arribasim-dev-extras,TomDataworks/opensim,TechplexEngineer/Aurora-Sim,RavenB/opensim,ft-/arribasim-dev-extras,rryk/omp-server,allquixotic/opensim-autobackup,QuillLittlefeather/opensim-1,ft-/opensim-optimizations-wip-extras,AlexRa/opensim-mods-Alex,N3X15/VoxelSim,ft-/arribasim-dev-tests,QuillLittlefeather/opensim-1,EriHoss/OpenSim_0.8.2.0_Dev_LibLSLCC,BogusCurry/arribasim-dev,EriHoss/OpenSim_0.8.2.0_Dev_LibLSLCC,TomDataworks/opensim,N3X15/VoxelSim,ft-/arribasim-dev-extras,Michelle-Argus/ArribasimExtract,rryk/omp-server,ft-/opensim-optimizations-wip-tests,BogusCurry/arribasim-dev,Michelle-Argus/ArribasimExtract,ft-/arribasim-dev-extras,ft-/arribasim-dev-tests,ft-/arribasim-dev-tests,ft-/opensim-optimizations-wip,justinccdev/opensim,RavenB/opensim,OpenSimian/opensimulator,bravelittlescientist/opensim-performance,intari/OpenSimMirror,cdbean/CySim,bravelittlescientist/opensim-performance,justinccdev/opensim,allquixotic/opensim-autobackup,ft-/opensim-optimizations-wip-tests,EriHoss/OpenSim_0.8.2.0_Dev_LibLSLCC,TomDataworks/opensim,AlphaStaxLLC/taiga,OpenSimian/opensimulator,ft-/arribasim-dev-extras,EriHoss/OpenSim_0.8.2.0_Dev_LibLSLCC,rryk/omp-server,allquixotic/opensim-autobackup,N3X15/VoxelSim,AlexRa/opensim-mods-Alex,justinccdev/opensim,rryk/omp-server,bravelittlescientist/opensim-performance,M-O-S-E-S/opensim,QuillLittlefeather/opensim-1,TomDataworks/opensim