Update master with all changes done to the development branch

If we were going to make any release, we would use master as the source.