Resolves #929 and improves #927.
Merge branch 'master' of https://github.com/villeteam/ville-standardutils