Merge tag 'v2.10.38' into develop

Version 2.10.38

diff --cc views/front/members/list.html
index e8efa55,ada6f59..d6ac5de
--- 1/views/front/members/list.html
--- 2/views/front/members/list.html
+++ b/views/front/members/list.html
@@@ -572,13 -572,6 +572,16 @@@
                  });
                {/if}
  
++<<<<<<< HEAD
 +                var mapContainerWidth = Number(leafletMap._container.clientWidth);
 +                var maxPopupWidth = .65 * mapContainerWidth;
 +                if (maxPopupWidth > 600) {
 +                    maxPopupWidth = 600;
 +                }
 +                var mapContainerHeight = Number(leafletMap._container.clientHeight);
 +                var maxPopupHeight = .7 * mapContainerHeight;
++=======
++>>>>>>> v2.10.38
  
                {foreach $mapItems as $m}
                  {if $m.lat != 0 && $m.lon != 0}