flax

81fbbe56 - Merge pull request #1961 from marcvanzee:upgrade-guide