Merge pull request #430 from holtgrewe/master

[FIX] Fixing default parameters for quality values in Mason 2.
[FIX] Adjusting tests to updated quality parameters.
Merge pull request #432 from holtgrewe/fix/mason2_tests

[FIX] Adjusting tests to updated quality parameters.
Merge branch 'master' into develop
Merge pull request #438 from esiragusa/develop

Merge master into develop