This PR merges the changes in master back to Develop so that the two branches can be in sync.
We need to change our git workflow, as this situation will keep happening in the future.
@marcoshuck