Added m4 directory to gitignore
Fixed PLATFORM check in configure.ac
Merge branch 'master' into plugins