catch switches between branches that have the same githead
Merge remote-tracking branch 'origin/master' into 1.4.5
fixes handling of 404 scripts
Some cleanup of option setting
fix safe_glob to properly handle the GLOB_ONLYDIR flag
remove simpleviewer personality