FC-2835: Fixes some image functionality that no longer works within formtools.
Merge pull request #1 from jeffcoughlin/p630

FC-2835: Fixes some image functionality that no longer works within formtools.