Merge branch 'jm2/detect2' of repo:/home/git/wrf-fire into jm2/detect2