@Chronothan work - #2054 , merge master branch
Merge branch 'master' of https://github.com/pioneerspacesim/pioneer.git into set_hyperspace_target_button

Conflicts:
	data/libs/ui/SmallLabeledButton.lua
	data/ui/Languages.lua

Resolved.