Merge branch 'master' into genete_canvasview-revisited