Restored ability to ignore sources commented out while correctly processing conditional comments at the same time
Merge remote-tracking branch 'origin/master' into conditionals