Merge anders/genericStructure branch to master

This commit is contained in:
Federico Rojas
2018-07-06 13:21:54 +02:00
parent 79db0090e6
commit 64e9e1a054