I have no idea what I'm doing D:
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/dev'
Small fixes, again
Merge pull request #4206 from RKF45/fixes

Small fixes maybe?