Merge pull request #2961 from octo/ff/utils