Fortran fixes#22

jprotze wants to merge 2 commits intollnl:fortran-fixesllnl/wrap:fortran-fixesfrom

jprotze:fortran-fixesjprotze/wrap:fortran-fixesCopy head branch name to clipboard