Rebuild
Revert "Add m4 scripts"

This reverts commit 5a5009899499b7dd18a978fb39b867f039b97947.
Revert "Rebuild"

This reverts commit 7ade769de10cacf4600e3c8a210cde4e5e61502b.
Merge branch 'master' into develop