Merge branch 'master' of https://github.com/Jdecaudin/pleiades
Merge branch 'master' of https://github.com/virhi/pleiades