Develop

Pull request to merge changes from master/develop into playereditor-master to keep branch up-to-date with other branches