jax

494c2dba - Merge branch 'master' into quickish-check