[v1.x] Backport of "#100: Update for 5.4"#104

ejgallego merged 2 commits intoocaml-ppx:v1.xocaml-ppx/ppx_import:v1.xfrom

ejgallego:ocaml_54_1xejgallego/ppx_import:ocaml_54_1xCopy head branch name to clipboard