Merge branch 'develop' into feature/travis-cmake

This commit is contained in:
Peter Dimov 2019-12-29 17:12:12 +02:00
commit b1e86bbc83

@ -1 +1 @@
Subproject commit 5761c469850da98ba43b01d91672f929c807a1d7
Subproject commit aed4c9c721d4c0a7d05565b1a614453f3fa0f450