• Merge branch 'master' into enhancement/switch_geodistancesortbuilder_… 

    …to_geovalidationmethod
    Isabel Drost-Fromm
    Isabel Drost-Fromm committed May 4, 2016
    6b9ac46