Merge pull request #293 from atrick/master

Reapply "Fix compilation warnings in extended test suite".