Snow Leopard: Fix handling of -q, -v, --quiet and --verbose options
Merge remote-tracking branch 'origin/master'