Merge pull request #1565 from hauke/liblo