Merged changes in the trunk up to revision 46787.

Conflicts resolved:
source/blender/blenkernel/intern/idcode.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/UI_resources.h
source/blender/makesrna/intern/rna_main.c

Merged changes in the trunk up to revision 46557.

Conflicts resolved:
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/makesrna/intern/rna_scene.c

Additional changes:
* Fix for recent changes of BKE_* function renaming.
* Fix for an "attempt to free NULL pointer" in BlenderStrokeRenderer::RenderStrokeRepBasic().

Fix for X and Y aspect ratios not working properly with Freestyle stroke rendering.
Problem report by octane98 in the BA Freestyle thread. Thanks!

Merged changes in the trunk up to revision 46309.

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_tools.c

Fix for the Selection by Group not working correctly when the specified group was empty.
Problem report by vicentecarro, with an example .blend file to reproduce the issue. Thanks!

Fix for a crash due to a corruption of data for addressing degenerate triangles in imported mesh data.

Merged changes in the trunk up to revision 46057.

Merged changes in the trunk up to revision 46045.

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesdna/DNA_scene_types.h

Suppressed "unused but set variable" warnings.

Suppressed a compiler warning about an empty controlled statement.
Reported by flokkievids, thanks!