Merge pull request #4531 from Verdier/master

Mick Hansen
2015-09-17T10:09:18+02:00

Revert scopeInclude clone. Better fixed by #4518