Fixed pre processor bug. Closes #1245
Merge branch 'ide-1.5.x' into ide-1.5.x-jssc