Fix issues with the new "reverse grand prix" feature and user defined GPs
Merge pull request #1547 from marcoll/master

Fix issues with the new "reverse grand prix" feature and user defined GPs