exclude modularize branch from unit tests,
as those have to be rewritten in that branch anyway
Merge branch 'master' into modularize