Merge branch 'query' of https://github.com/stapelberg/dsa-puppet