Merge commit '905794eaa666d36bf900acf3377b7eb7e39fdb95' into 1.1.3
Merge branch '1.1.3' into development
Changed folder name, added base settings for r3dp
Merge branch '1.1.3' into development
Make the window state that it uses gl.
Merge remote-tracking branch 'upstream/development' into development