Signed-off-by: Tibor Vass <teabee89@gmail.com> Conflicts: VERSION Upstream-commit: 4a17e6eeddee1fe13c7aa5ad7f6a789490add0fe Component: engine