Merged changes in the trunk up to revision 55357.

Resolved conflicts:
release/datafiles/startup.blend
source/blender/editors/space_nla/nla_buttons.c

Also updated source/blender/blenkernel/intern/linestyle.c as a follow-up of
recent changes for the use of bool.

source/creator/CMakeLists.txt

@@ -927,6 +927,7 @@ endif()
 		bf_intern_raskter
 		bf_intern_opencolorio
 		extern_rangetree
+		extern_wcwidth
 	)
 
 	if(WITH_COMPOSITOR)