Merge branch 'build_configuration' into renderer
Merge branch 'renderer' of https://github.com/El-Rico/ZED into renderer