CH11 Franc/Dollar factory now returns Money
Merge branch 'CH11'