Add XaoS 3.6
Merge pull request #5764 from leonardvandriel/master

Add XaoS 3.6