Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# .github/pull_request_template.md
# indra/newview/llmutelist.cpp
# indra/newview/lltoolpie.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml