Before hacks from Frank
Merge branch 'rc' of https://github.com/frankbonnet/PAS.git into rc
Before hacks from Frank