Closes #919
Merge pull request #920 from StackStorm/pwh/fabricrunner_fix

Closes #919