Merge branch 'fusionax' of /home/git/platal into fusionax