use features server on (live) crf.make
Merge branch 'crf-7.x-1.x'