Merge branch 'hotfix/0.1.6-6'

* hotfix/0.1.6-6:
  Refactored logic.
  Set ':make' only within CMake projects.
Less strict on error reporting.
Merge branch 'develop' into hotfix/0.1.6-7

* develop:
  Less strict on error reporting.
  Corrected logic in primary config file.
Merge branch 'hotfix/0.1.6-7' into develop

* hotfix/0.1.6-7: