Bringing hyl:master up to date with source