Merge pull request #2656 from hnyman/fwk