release 3.6 reg
Merge branch 'master' of https://github.com/MichaelHoffmann/AGORA
merging changes for 3.6