Merge branch 'dcharbonnier-master'
bump version for release
add an extra to errors