Frontend extensions for #ifdef to if
Merge remote-tracking branch 'origin/master'