Third attempt to merge Sapphire v 2.6.000.

The use of a deduction hint did not help build Sapphire.
This one compiler is not able to figure out the template
parameters, so I added explicit template parameters in
every case that caused an error.

plugins/Sapphire

@@ -1 +1 @@
-Subproject commit fedf05d1a418c6dbb3b6d0cf07e3851da8f9d032
+Subproject commit e2bcefcaa7753f017cd131a28aae0e5e346aafec