PR/351: Fix compilation of empty files.
Merge remote-tracking branch 'upstream/master'