Merge develop into master

There is no reason for this (open sourced) repository to follow our git flow structure, so I am opting for having only the master branch available and working on feature branches.