fix overspecifiation of test
Merge branch '34-pointsize-master'
Merge branch 'master' into 0.7-rc