Merge pull request #1 from dgruhl/master

Bulk update to C++-17