fa8f06d Merge branch 'f27' into f26

Merged and Committed by rdieter 6 years ago
    Merge branch 'f27' into f26