Merge pull request #1937 from hzeller/consexpr-opportunity