Merge 0.6 Into The Master

this should be changed back to dev-master.

Btw, nothing forbids you to keep the alias for both master and experimental in the file, avoiding to have to change it when merging branches together. Composer only uses the alias for the current branch anyway. This allows to have this simple workflow: when bumping the experimental branch to 0.7, set both branch aliases to 0.7 in this branch. The day when you will merge the 0.7 commits into master, master will become 0.7 because of the commit done when starting the 0.7 development. This way, you don't need to remember to bump the version twice, when starting to work on it, and when preparing the release