Conflict solved
Merge branch 'Conflict-wiebe' of https://github.com/wrvangeest/Context into Conflict-wiebe