Merge pull request #365 from asarhaddon/cpp-ada.2-conformance