Merged in default (pull request #687)

Fix the immediate issues with gevolution but disable it by default as it needs major work

Approved-by: Richard Laager