Development to Master

All the changes done to development to merge to master before merging the windows-stable branch.