Update 'Template uses' comment
Merge branch 'passenger_tuning' into all_features