phpdoc
Merge branch 'master' into imp_6_2
Move iterator filtering to separate filter class