Merge pull request #3127 from wvanlint/non_strict_forwarding