Save language in profile settings. Fixes #648
Merge remote-tracking branch 'upstream/master'