12 Commits (user/amery/wip/aclocal)