Merge pull request #7 from knaufk/FLINK-22034