Merge branch 'master' of /home/agl0809/prueba with conflicts.
make stable  ide issue