merge master
v0.934 merged, again
Merge branch 'development' into filter
fixes to filter spec and changelog
Merge branch 'development' into filter