Added by Nikos Skalkotos about 9 years ago
Merge branch 'master' into develop
bump version to 0.12.1next
Conflicts: version version.m4