flax

a7d54fac - Merge branch 'master' into module-docstring