Issue #WP-1724: program finder fixes
Merge branch 'master' of github.com:gsbitse/gsb_theme