Port main 3.6.3 changes to develop 3.7.0#2660

cvvergara merged 2 commits intopgRouting:developpgRouting/pgrouting:developfrom

cvvergara:port-main-3.6.3-changes-to-develop-3.7.0cvvergara/pgrouting:port-main-3.6.3-changes-to-develop-3.7.0Copy head branch name to clipboard