MSVC 2013 compatibility: work around internal compiler error.

And apparently this is not yet fixed even in 2014 CTP. What the hell.
modules: fix CMake syntax.

Sadly this somehow doesn't work at all. Need further investigation.
Merge branch 'master' into compatibility