Merge branch 'master' of https://github.com/Arcavias/arcavias-core
Merge pull request #760 from nsendetzky/master

Merge branch 'master' of https://github.com/Arcavias/arcavias-core