Merge weimarnetz meshkit into meshkit master branch