Currency merge 2

This might include a redundant commit - I fat-fingered something. Let me know if it doesn't apply cleanly.

Merge request reports

Loading