Fixed behaviour for non-octopos builds
Merge branch 'octopos' of https://github.com/TobiasRp/octopos_gc into octopos