Merge pull request #354 from adrianschmutzler/fe80master