Merge branch 'release-4.1.0'
add target framework dir to ILMerge

fixes #1693

also fixes an issue people would have when building in release mode from
a directory with spaces.
Merge remote-tracking branch 'origin/hotfix-4.1.1'
Merge branch 'master' into develop