Merging the commits from the master

I make changes on the master that I want to merge on develop as well (since I'll keep working on develop)