land-borders enabled
Merge branch 'dev' into servlet2