Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:sesuncedu/sleuthkit
reset m4/ax_jni_include_dir.m4