Update Makefile.am
Merge branch 'master' into meemory
Memory domains improvements.