Merge branch 'master' of git@github.com:mangos/mangos.git into procflag