Commit 9fea6b4dd41bfe2b85f788523162658a7ab9bd49

Ebrahim Byagowi 2019-07-05T18:46:41

[amalgam] Use it in cmake port and fix conflicts (#1812)