Merge pull request #606 from SvenRoederer/update_community-berlin