dev branch

[Mike Hommey]

Hi,

I'm reiterating the request to merge releases to the dev branch so that
git describe gives a correct version number when filling VERSION, when
building off the dev branch.

Cheers,

Mike