mine filter & fixes & updates

Created originally on Bitbucket by efolio (Etienne Folio)

Was already merged in Bitbucket before import, marked as merged by the import user

Source changeset not longer availableat the time of import. Commit listwill look empty

Happy birthday Quentin :D