Merge branch 'master' into Mills's-Branch
triobol update

this is a temporary fix for currency conversion, until we can find a
less cumbersome method
Merge branch 'Mills's-Branch'