Revert "Revert "Merge branch 'master' into threemusketeers""

This reverts commit 7d90dc50fb54d82265996373b406d361c303c82f.
Started manual merging process to master branch. Needs projects page!