update master branch

Luca Freckmannrequested to merge
7.x-1.2-dev into 7.x-1.x

filter functionality peer-reviewed

Edited by Luca Freckmann

Merge request reports