Merge from devel branch; frs provider rewritten using pure Ruby and not inline resources.