Merge branch 'master' into DRTVWR-486

indra/edit-me-to-trigger-new-build.txt

indra/llinventory/CMakeLists.txt

indra/llinventory/lleconomy.cpp

indra/llinventory/lleconomy.h

indra/llui/llscrolllistctrl.cpp

indra/llui/llscrolllistctrl.h

indra/llui/lltextbase.cpp

indra/llui/lltextbase.h

indra/newview/CMakeLists.txt

indra/newview/VIEWER_VERSION.txt

indra/newview/llagent.cpp

indra/newview/llagentbenefits.cpp

indra/newview/llagentbenefits.h

indra/newview/llfloaterbvhpreview.cpp

indra/newview/llfloatergroups.cpp

indra/newview/llfloaterimagepreview.cpp

indra/newview/llfloatermodelpreview.cpp

indra/newview/llfloaternamedesc.cpp

indra/newview/llfloaternamedesc.h

indra/newview/llfloaterreporter.cpp