Issue #87
Merge pull request #88 from agonist/FXForm2-8.0

Issue #87