Commit Graph

6 Commits

Author SHA1 Message Date
bryan sefcik
de1956f47b Ran IWYU on Public headers under Engine/Source/Developer/...
Headers are updated to contain any missing #includes needed to compile and #includes are sorted.  Nothing is removed.

#ushell-cherrypick of 21064294 by bryan.sefcik
#jira
#preflight 62d5c2111062f2e63015e598

#ROBOMERGE-OWNER: bryan.sefcik
#ROBOMERGE-AUTHOR: bryan.sefcik
#ROBOMERGE-SOURCE: CL 21155249 via CL 21158121 via CL 21161259
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v972-20964824)

[CL 21182053 by bryan sefcik in ue5-main branch]
2022-07-20 12:03:45 -04:00
ryan durand
471d972e62 Updating copyright for Engine Developer.
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10869240 via CL 10869516 via CL 10869902
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870584 by ryan durand in Main branch]
2019-12-26 15:32:37 -05:00
Ben Marsh
7598af0532 Update copyright notices to 2019.
#rb none
#lockdown Nick.Penwarden

[CL 4662404 by Ben Marsh in Main branch]
2018-12-14 13:41:00 -05:00
Ben Marsh
30f891786a Copying //UE4/Dev-Core to //UE4/Dev-Main (Source: //UE4/Dev-Core @ 3847469)
#lockdown Nick.Penwarden
#rb none

============================
  MAJOR FEATURES & CHANGES
============================

Change 3805828 by Gil.Gribb

	UE4 - Fixed a bug in the lock free stalling task queue and adjusted a comment. The code is not current used, so this is not actually change the way the code works.

Change 3806784 by Ben.Marsh

	UAT: Remove code to compile UBT when using UE4Build. It should already be compiled as a dependency of UAT.

Change 3807549 by Graeme.Thornton

	Add a cook timer around VerifyCanCookPackage. A licensee reports this taking a lot of time so it'll be good to account for it.

Change 3807727 by Graeme.Thornton

	Unhide the text asset format experimental editor option

Change 3807746 by Josh.Engebretson

	Remove WER from iOS platform

Change 3807928 by Robert.Manuszewski

	When async loading, GC Clusters will be created after packages have been processed to avoid situations where some of the objects that are being added to a cluster haven't been fully loaded yet

Change 3808221 by Steve.Robb

	GitHub #4307 - Made GetModulePtr() thread safe by not using GetModule()

	^ I'm not convinced by how much thread-safer this is really, but it's tidier anyway.

Change 3809233 by Graeme.Thornton

	TBA: Misc changes to text asset commandlet
	 - Rename mode to "loadsave"
	 - Add -outputFormat option which can be assigned "text" or "binary"
	 - When saving binary, use a differentiated filename so that source assets aren't overwritten

Change 3809518 by Ben.Marsh

	Remove the outdated UnrealSync automation script.

Change 3809643 by Steve.Robb

	GitHub #4277 : fix bug; FMath::FormatIntToHumanReadable 3rd comma and negative value

	#jira UE-53037

Change 3809862 by Steve.Robb

	GitHub #3342 : [FRotator.h] Fix to DecompressAxisFromByte to be more efficient and reflect its intent accurately

	#jira UE-42593

Change 3811190 by Graeme.Thornton

	Add support for writing specific log channels to their own files

Change 3811197 by Graeme.Thornton

	Minor updates to output formatting and timing for the text asset commandlet

Change 3811257 by Robert.Manuszewski

	Cluster creation will now be time-sliced

Change 3811565 by Steve.Robb

	Define out non-monolithic module functions.

Change 3812561 by Steve.Robb

	GitHub #3886 : Enable Brace-Initialization for Declaring Variables

	Incorrect semi-colon search removed after discussion with author.
	Test added.

	#jira UE-48242

Change 3812864 by Steve.Robb

	Removal of some unproven code which was supposed to fix hot reloading BP class functions in plugins.

	See: https://udn.unrealengine.com/questions/376978/aitask-blueprint-nodes-disappear-when-their-module.html

	#jira UE-53089

Change 3820358 by Ben.Marsh

	PR #4358: Incredibuild use ShowAgent by default (Contributed by projectgheist)


Change 3822594 by Ben.Marsh

	UAT: Improvements to log file handling.

	- Always create log files in the final location, rather than writing to a temp directory and copying in later.
	- Now supports -Verbose and -VeryVerbose for increasing log verbosity, rather than -Verbose=XXX.
	- Keep a backlog of log output before the log system is initialized, and flush it to the log file once it is.
	- Allow buildmachines to specify the uebp_FinalLogFolder environment variable, which is used to form paths for display. When build machines copy log files elsewhere after UAT finishes (eg. a network share), this allows error messages to display the right location.

Change 3823695 by Ben.Marsh

	UGS: Fix issue where precompiled binaries would not be shown as available for a change until scrolling the last submitted code change into the buffer (other symptoms, like de-focussing the main window would cause it to go back to an unavailable state, since the changes buffer was shrunk).

	Now always queries changes up to the last change for which zipped binaries are available.

Change 3823845 by Ben.Marsh

	UBT: Exclude C# projects for unsupported platforms when generating project files.

Change 3824180 by Ben.Marsh

	UGS: Add an option to show changes by build machines, and move the "only show reviewed" option in there too (Options > Show Changes).

	#jira

Change 3825777 by Steve.Robb

	Fix to return value of StringToBytes.

Change 3825810 by Ben.Marsh

	UBT: Reduce length of include paths for MSVC toolchain.

Change 3825822 by Robert.Manuszewski

	Optimized PIE lazy pointer fixup. Should be up to 8x faster now.

Change 3826734 by Ben.Marsh

	Remove code to disable TextureFormatAndroid on Linux. It seems to be an editor dependency.

Change 3827730 by Steve.Robb

	Try to avoid decltype(auto) if it's not supported.

	See: https://udn.unrealengine.com/questions/395644/build-417-with-c11-on-linux-ttuple-errors.html

Change 3827745 by Steve.Robb

	Initializer list support for TMap.

Change 3827770 by Steve.Robb

	GitHub #4399 : Added a CONSTEXPR qualifiers to FVariant::GetType()

	#jira UE-53813

Change 3829189 by Ben.Marsh

	UBT: Now always writes a minimal log file. By default, just contains the regular console output and any reasons why actions are outdated and needed to be executed. UAT directs child UBT instances to output logs into its own log folder, so that build machines can save them off.

Change 3830444 by Steve.Robb

	BuildVersion and ModuleManifest moved to Core, and parsing of these files reimplemented to avoid a JSON library.
	This should be revisited when Core has its own JSON library.

Change 3830718 by Ben.Marsh

	Fix incorrect group name being returned by FStatNameAndInfo::GetGroupName() for stat groups.

	The editor populates the viewport stats list by calling this for every registered stat and stat group (via FLevelViewportCommands::HandleNewStatGroup). The menu entry attempts to show the stat name with STAT_XXX stripped from the start as the menu item label, with the free-form text description as a tooltip.

	For stat groups, the it would previously just return the stat group name as "Groups" (due to the raw naming convention of "//Groups//STATGROUP_Foo//..."). Since this didn't match the expected naming convention in FLevelViewportCommands::HandleNewStat (ie. STAT_XXX or STATGROUP_XXX), it would fail to add it.

	When the first actual stat belonging to that group is added, it would add a menu entry for the group based on that, but the stat description no longer makes sense as a tooltip for the group. As a result, all the editor tooltips were junk.

	#jira UE-53845

Change 3831064 by Ben.Marsh

	Fix log file contention when spawning UBT recursively.

Change 3832654 by Ben.Marsh

	UGS: Fix error panel not being selected when opened, and weird alignment/color issues on it.

Change 3832680 by Ben.Marsh

	UGS: Fix failing to detect workspace if synced to a different stream. Seems to be a regression caused by recent P4D upgrade.

Change 3832695 by Ben.Marsh

	UGS: Invert the options in the 'Show Changes' submenu for simplicity.

Change 3833528 by Ben.Marsh

	UAT: Script to rewrite source files with public include paths relative to the 'Public' folder. Usage is: RebasePublicIncludePaths -UpdateDir=<Dir> [-Project=<Dir>] [-Write].

Change 3833543 by Ben.Marsh

	UBT: Allow targets to opt-out of having public include paths added for every dependent module. This reduces the command line length when building a target, which has recently become a problem with larger games (due to Microsoft's compiler embedding the command line into each object file, with a maximum length of 64kb). All engine modules are compiled with this enabled; games may opt into it by setting bLegacyPublicIncludePaths = false; from their .target.cs, as may individual modules.

Change 3834354 by Robert.Manuszewski

	Archetype pointer will now be cached to avoid locking the object tables when acquiring its info. It should also be faster this way regardless of any locks.

	#jira UE-52035

Change 3834400 by Robert.Manuszewski

	Fixing crash on exit caused by cached archetypes not being cleaned up before static exit cleanup.

	#jira UE-52035

Change 3834947 by Steve.Robb

	USE_FORMAT_STRING_TYPE_CHECKING removed from FMsg::Logf and FMsg::Logf_Internal.

Change 3835004 by Ben.Marsh

	Fix code that relies on dubious behavior of requiring referenced "include path only" modules having their _API macros set to be empty, even if the module is actually implemented in a separate DLL.

Change 3835340 by Ben.Marsh

	Fix errors making installed build from directories with spaces in the name.

Change 3835972 by Ben.Marsh

	UBT: Improved diagnostic message for targets which don't need a version file.

Change 3836019 by Ben.Marsh

	UBT: Fix warnings caused by defining linkage macros for third party libraries.

Change 3836269 by Ben.Marsh

	Fix message box larger than the screen height being created when a large number of modules are incompatible on startup.

Change 3836543 by Ben.Marsh

	Enable SoundMod plugin on Linux, since it's already supported through the editor.

Change 3836546 by Ben.Marsh

	PR #4412: fix type mismatch (Contributed by nakapon)


Change 3836805 by Ben.Marsh

	Fix commandlet to compile marketplace plugins.

Change 3836829 by Ben.Marsh

	UBT: Fix ability to precompile plugins from installed engine builds.

Change 3837036 by Ben.Marsh

	UBT: Write the previous and new contents of intermediate files to the log if they change. Makes it easier to debug unexpected rebuilds.

Change 3837037 by Ben.Marsh

	UBT: Fix engine modules having inconsistent definitions depending on whether modules are only referenced for their include paths vs being linked into a binary (due to different _API macro).

Change 3837040 by Ben.Marsh

	UBT: Remove code that initializes members in ModuleRules and TargetRules objects before the constructor is run. This is no longer necessary, now that the backwards-compatible default constructors have been removed.

Change 3837247 by Ben.Marsh

	UBT: Remove UELinkerFixups module, now that plugins and precompiled modules do not require hacks to force initialization (since they're linked in as object files).

	Encryption and signing keys are now set via macros expanded from the IMPLEMENT_PRIMARY_GAME_MODULE macro, via project-specific macros added in the TargetRules constructor.

Change 3837262 by Ben.Marsh

	UBT: Set whether a module is an engine module or not via a default value for the rules assembly. All non-program engine and enterprise modules are created with this flag set to true; program targets and modules are now created from a different assembly that sets it to false. This removes hacks from UEBuildModule needed to adjust behavior for different module types based on the directory containing the module.

	Also add a bUseBackwardsCompatibleDefaults flag to the TargetRules class, also initialized to a default value from a setting passed to the RulesAssembly constructor. This controls whether modules created for the target should be configured to allow breaking changes to default settings, and is set to false for all engine targets, and true for all project targets.

Change 3837343 by Ben.Marsh

	UBT: Remove the OverrideExecutableFileExtension target property. Change the only current use for this (the MayaLiveLinkPlugin target) to use a post build step to copy the file instead.

Change 3837356 by Ben.Marsh

	Fix invalid character encodings.

Change 3837727 by Graeme.Thornton

	UnrealPak: KeyGenerator: Only generate prime table when required, not all the time

Change 3837823 by Ben.Marsh

	UBT: Output warnings and errors when compiling module rules assembly in a way that allows them to be double-clicked in the Visual Studio output window.

Change 3837831 by Graeme.Thornton

	UBT: When parsing crypto settings, always load legacy data first, then allow the new system to override it. Provides the same key backwards compatibility that the editor settings class gives

Change 3837857 by Robert.Manuszewski

	PR #4404: Make FGCArrayPool singleton global instead of per-CU (Contributed by mhutch)


Change 3837943 by Robert.Manuszewski

	PR #4405: Fix FGarbageCollectionTracer (Contributed by mhutch)


Change 3838451 by Ben.Marsh

	UBT: Fix exceptions thrown on a background thread while caching C++ includes not being caught and logged correctly. Now captures exceptions and re-throws on the main thread.

	#jira UE-53996

Change 3839519 by Ben.Marsh

	UBT: Simplify configuring bPrecompile and bUsePrecompile settings for modules. Each rules assembly can now be configured as installed, which defaults the module rules it creates to use precompiled data.

Change 3843790 by Graeme.Thornton

	UnrealPak: Log the size of all encrypted data

Change 3844258 by Ben.Marsh

	Fix plugin compile failure when created via new plugin wizard. Passing -plugin on the command line is unnecessary, and is now reserved for packaging external plugins for the marketplace.

	Also extend the length of time that the error toast stays visible, and don't delete the plugin on failure.

	#jira UE-54157

Change 3845796 by Ben.Marsh

	Workaround for slow performance of String.EndsWith() on Mono.

Change 3845823 by Ben.Marsh

	Fix case sensitive matching of platform names in -TargetPlatform=X argument to BuildCookRun.

	#jira UE-54123

Change 3845901 by Arciel.Rekman

	Linux: fix crash due to lambda lifetime issues (UE-54040).

	- The lambda goes out of scope in FBufferVisualizationMenuCommands::CreateVisualizationCommands, crashing the editor if compiled with a recent clang (5.0+).

	(Edigrating 3819174 to Dev-Core)

Change 3846439 by Ben.Marsh

	Revert CL 3822742 to always call Process.WaitForExit(). The Android target platform module in the editor spawns ADB.EXE, which inherits the editor's stdout/stderr handles and forks itself. Process.WaitForExit() waits for EOF on those pipes, which never occurs because the forked process never terminates.

	Proper fix is probably to have the engine explicitly duplicate stdout/stderr handles for new pipes to output process, but too risky before copying up to Main.

Change 3816608 by Ben.Marsh

	UBT: Use DirectoryReference objects for all include paths.

Change 3816954 by Ben.Marsh

	UBT: Remove bIncludeDependentLibrariesInLibrary option. This is not widely supported by platform toolchains, and is not used anywhere.

Change 3816986 by Ben.Marsh

	UBT: Remove UEBuildBinaryConfig; UEBuildBinary objects are now just created directly.

Change 3816991 by Ben.Marsh

	UBT: Deprecate PlatformSpecificDynamicallyLoadedModules. We no longer have any special behavior for these modules.

Change 3823090 by Ben.Marsh

	UAT: Improve logging for child UAT instances.

	- Calling RunUAT now requires an identifier for prefixing into the parent log, which is also used to determine the name of the log folder.
	- Stdout is no longer written to its own output file, since it's written to the parent stdout, the parent log file, and the child log file anyway.
	- Log folders for child UAT instances are left intact, rather than being copied to the parent folder. The derived names for the copied names were confusing and hard to read.
	- Output from UAT is no longer returned as a string. It should not be parsed anyway (but may be huge!). ProcessResult now supports running without capturing output.

Change 3826082 by Ben.Marsh

	UBT: Add a check to make sure that all modules that are precompiled are correctly marked to enable it, even if they are part of the build target.

Change 3827025 by Ben.Marsh

	UBT: Move the compile output directory into a property on the module, and explicitly pass it to the toolchain when compiling.

Change 3829927 by James.Hopkin

	Made HTTP interface const correct

Change 3833533 by Ben.Marsh

	Rewrite engine source files to base include paths relative to the "Public" directory. This allows reducing the number of public include paths that have to be added for engine modules.

Change 3835826 by Ben.Marsh

	UBT: Precompiled targets now generate a separate manifest for each precompiled module, rather than adding object files to a library. This fixes issues where object files from static libraries would not be linked into a target if a symbol in them was not referenced.

Change 3835969 by Ben.Marsh

	UBT: Fix cases where text is being written directly to the console rather than via logging functions.

Change 3837777 by Steve.Robb

	Format string type checking added to FOutputDevice::Logf.
	Fixes for those.

Change 3838569 by Steve.Robb

	Algo moved up a folder.

[CL 3847482 by Ben Marsh in Main branch]
2018-01-20 11:19:29 -05:00
Ben Marsh
13d012685f Merging copyright update from 4.19 branch.
#rb none
#rnx
#jira

[CL 3818977 by Ben Marsh in Staging-4.19 branch]
2018-01-02 15:30:26 -05:00
Andrew Grant
691342e35a Copying //UE4/Orion-Staging to //UE4/Main (Source: //Orion/Dev-General @ 3606378)
#lockdown Nick.Penwarden
#rb na


Change 3604978 on 2017/08/23 by Andrew.Grant

	Fix for OR-42722 from 4.17 branch

	#!tests compiled
	#!rb max.chen

Change 3604960 on 2017/08/23 by Andrew.Grant

	Proper fix for OR-43001, removed hack-around.

	#!tests compiled
	#!rb max.chen

Change 3604881 on 2017/08/23 by robomerge

	#!ROBOMERGE-AUTHOR: andrew.grant
	Changed LostReservation message in tests to info from warning.

	#!tests compiled
	#!rb none

	#!ROBOMERGE-SOURCE: CL 3604871 in //Orion/Release-42.3/... via CL 3604878 via CL 3604880
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3604566 on 2017/08/23 by robomerge

	#!ROBOMERGE-AUTHOR: andrew.grant
	Gauntlet - return -1 for a test if there's a fatal error. Removed network errors failing tests (should be down to test to determine)

	Made SoakTest better able to detect failed drafts and incomplete matches

	#!tests ran multiple soaks and SoloAllHeroes
	#!rb none

	#!ROBOMERGE-SOURCE: CL 3604560 in //Orion/Release-42.3/... via CL 3604563 via CL 3604565
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3604181 on 2017/08/23 by David.Ratti

	Set ULandscapeHeightfieldCollisionComponent to be NetAddressable so that it can be replicated as a movement base without error.

	OR-42615
	#!rb none
	#!tests pie

Change 3603647 on 2017/08/22 by Laurent.Delayen

	AnimProxy: initialize Actor/Component transforms.

	#!rb none
	#!tests lane minion test map

Change 3603343 on 2017/08/22 by robomerge

	#!ROBOMERGE-AUTHOR: don.eubanks
	Added several more stats to the Card Shop stat panel.
	  + Basic Attack Damage
	  + Max Move Speed
	  + Armor Penetration / Percent
	  + Ability Penetration / Percent

	Added utility function to AbilitySystemComponent to calculate an ability's value with additional Required/Ignore tags and Target tag container (functionality moved from AttributeView)

	#!rb matt.schembari
	#!tests Compile DebugGame Editor Win64 / Shipping Client PS4 / PIE

	#!ROBOMERGE-SOURCE: CL 3603172 in //Orion/Main/...
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3603121 on 2017/08/22 by Laurent.Delayen

	Added FAnimationRuntime::LerpPosesPerBone

	#!rb none
	#!tests lane minions split body anims.

Change 3603010 on 2017/08/22 by Laurent.Delayen

	Draw box around Actor being debugged by 'ShowDebug' command, to help identify what we're viewing.

	#!rb none
	#!tests lane minions

Change 3602574 on 2017/08/22 by robomerge

	#!ROBOMERGE-AUTHOR: andrew.grant
	Fixed linux warning

	#!tests compiled
	#!rb none

	#!ROBOMERGE-SOURCE: CL 3602571 in //Orion/Release-42.3/... via CL 3602572
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3602396 on 2017/08/22 by andrew.grant

	#!CodeReview: andrew.grant, jason.bestimt, jeff.williams

	Unresolved conflicts. andrew.grant, please merge this change by hand.
	//ROBOMERGE_ORION_Dev_General/Engine/Source/Programs/AutomationTool/NotForLicensees/Gauntlet/Gauntlet.Automation.csproj

	--------------------------------------
	Updated Gauntlet log parser for new callstack format
	Added offline and runtime Gauntlet tests to verify error generation and parsing

	#!tests ran lots of tests locally
	#!rb codereviewed

	#!ROBOMERGE-SOURCE: CL 3601948 in //Orion/Release-42.3/... via CL 3601950
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3602373 on 2017/08/22 by Andrew.Grant

	Fixed compile error

	#!tests compiled
	#!rb none

Change 3602321 on 2017/08/22 by robomerge

	#!ROBOMERGE-AUTHOR: andrew.grant
	LogAssertFailedMessage
	- Removed callstack dumping from LogAssertFailedMessage (now in StaticFailDebug)
	- Moved script dumping inside GIsCritial check

	StaticFailDebug
	- Now dumps the callstack if supported for non-ensures. This results in PS4 (and other platforms) now displaying a callstack on a Fatal log.
	- Removed log flush, was redundant
	- Removed LowLevelOutputDebugStringf. If a platform needs this it can be done later in its error device

	OutputMultiLineCallstack
	- Renamed to FDebug::LogFormattedMessageWithCallstack and exposed in headers (calling locations have been updated to remove their extern declarations)
	- No longer writes into the buffer to format it (!)
	- LogName is now the first param. If NAME_None it writes using LowLevelOutputDebugString
	- While writing out error information all callstack likes are prefixed with [Callstack]

	Added brief documentation about the order of ops for ensures/asserts/fatal logs

	#!tests ran lots of tests locally
	#!rb codereviewed

	#!ROBOMERGE-SOURCE: CL 3601943 in //Orion/Release-42.3/... via CL 3601944
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3602316 on 2017/08/22 by robomerge

	#!ROBOMERGE-AUTHOR: andrew.grant
	Changed various platform-specific implementations of ProgramCounterToHumanReadableString to return info in a canonical format of address module!func [file:line].

	E.g.

	0x00416A5F OrionClient.self!FEngineLoop::Tick() [D:\Epic\Orion\Release-Next\Engine\Source\Runtime\Launch\Private\LaunchEngineLoop.cpp:3295]

	#!tests ran lots of tests locally
	#!rb codereviewd

	#!ROBOMERGE-SOURCE: CL 3601940 in //Orion/Release-42.3/... via CL 3601941
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3602311 on 2017/08/22 by robomerge

	#!ROBOMERGE-AUTHOR: andrew.grant
	Sony don't allow exception handling on PS4 so for sometime we've had an issue where crashes have no presence in logs*

	This change adds postmortem analysis to PS4DevkitUtil. If the OS terminates the process then it process the minidump and writes the cause and the callstack to stdout. As a bonus PS4DevkitUtil can now display cause & callstacks from minidumps via "PS4DevkitUtil postmortem -dump=path\to\crash.orbisdmp"

	 (*if you're lucky the kit may have been setup correctly to submit dumps to crashreporter, it may have actually worked, and you may be able to find it).

	#!tests run many times on Orion tests
	#!rb CR

	#!ROBOMERGE-SOURCE: CL 3601929 in //Orion/Release-42.3/... via CL 3601930
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3599823 on 2017/08/21 by Jian.Ru

	Allow MaxCascades cvar be set to 0 (should perobject shadow be forced on?)
	#!jira UE-48468,OR-42749
	#!rb Daniel.Wright
	#!tests editor

Change 3598765 on 2017/08/19 by Andrew.Grant

	Disable regeneration of missing cubemap data in cooked build.

	Need some way of handling this, but currently this breaks PS4 anytime someone makes a map change and doesn't build lighting...

	#!review-3598766 @daniel.lamb
	#!tests ran PS4 successfully
	#!rb none

Change 3597800 on 2017/08/18 by Laurent.Delayen

	Added FAnimationRuntime::LerpPoses. Blends two poses together, but first pose is also storing results. To save on copying poses when not necessary.
	Removed individual use of ZERO_ANIMWEIGHT_THRESH, instead use FAnimWeight functions.
	FAnimationRuntime weight functions use FAnimWeight for consistency. (IsFullWeight was different).

	#!rb none
	#!codereview martin.wilson, lina.halper
	#!tests minion test lane map

Change 3597332 on 2017/08/18 by Laurent.Delayen

	SkelMeshComponent LOD update only refreshes transforms when rendered.
	If AnimGraph eval is done, make sure Graph has been updated at least once.

	Fixes:
	- Significance Manager setting MinLOD on non recently rendered minions, causing them to refresh bones.
	-  Minions calling eval with graph not updated due to having bUseRefPoseOnInitAnim set. It means it's possible to refresh bones on a graph that has never been updated, causing a crash.

	#!rb martin.wilson, lina.halper
	#!codereview martin.wilson, lina.halper
	#!tests minions test lane map. placing skelmeshes in editor and making sure LOD update works as expected.

Change 3597042 on 2017/08/18 by Daniel.Lamb

	Added onlinesubsystemmcp to the cooksettings blacklist.
	#!rb Trivial
	#!test none

Change 3596575 on 2017/08/18 by Shaun.Kime

	Fixing nonunity build issues

	#!rb none
	#!tests compiled OrionGame with unity builds disabled

Change 3595475 on 2017/08/17 by Andrew.Grant

	Fixed issue with PS4 asserts not being detected during test shutdown

	#!tests ran locally
	#!rb none

Change 3595415 on 2017/08/17 by robomerge

	#!ROBOMERGE-AUTHOR: andrew.grant
	Added check for network failure to tests

	#!tests ran locally
	#!rb none

	#!ROBOMERGE-SOURCE: CL 3595412 in //Orion/Release-42.3/... via CL 3595414
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3594725 on 2017/08/17 by Ben.Salem

	Add "Worst offenders" table and runtime to FX perf reports.
	#!rb adric.worley
	#!tests Ran a few FX Perf tests and generated reports.

Change 3594195 on 2017/08/17 by Shaun.Kime

	Integration from Dev-Niagara to Dev-General. Note that this may cause assets to need to be recooked. Please be prepared for longer than normal cook times once syncing past this changelist.

	#!rb none
	#!tests preflight'ed change, QA ran multiple soak tests

Change 3594177 on 2017/08/17 by Andrew.Grant

	Fixed issue that was causing exceptions not to be recognized

	#!tests ran locally
	#!rb none

Change 3594090 on 2017/08/17 by robomerge

	#!ROBOMERGE-AUTHOR: laurent.delayen
	Fix for mesh desyncing during online play.
	https://jira.it.epicgames.net/browse/UE-45947

	#!rb none
	#!tests none
	[CODEREVIEW] zak.middleton

	#!ROBOMERGE-SOURCE: CL 3590625 in //Orion/Release-42.3/... via CL 3590626
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3594022 on 2017/08/17 by Laurent.Delayen

	SkeletalMeshComponent::InitAnim
	- Do not call RefreshBoneTransforms without calling TickAnim first. AnimGraph could get in a bad state.
	- Do not call RefreshBoneTransforms if AnimInstance has not been initialized.
	- Do not call RefreshBoneTransforms if bUseRefPoseOnInitAnim is set. Which it could if bForceReinit was false.

	#!rb martin.wilson
	#!tests minion test lane map.

Change 3593972 on 2017/08/17 by Chris.Bunner

	Duplicating instanced static mesh fixes from Dev-Editor - 3502581, 3570934, 3593597.
	#!rb None
	#!tests Editor, -game, PC
	#!jira UE-48521, OR-42612

Change 3590611 on 2017/08/16 by David.Ratti

	Spot edigrate CL 3584203 to fix show collision crash in mono 2
	#!rb none
	#!tests compile

Change 3590452 on 2017/08/16 by Laurent.Delayen

	Fix for mesh desyncing during online play.
	https://jira.it.epicgames.net/browse/UE-45947

	#!rb none
	#!tests none
	#!codereview zak.middleton

Change 3590378 on 2017/08/16 by Laurent.Delayen

	Integrated CL #!3585145 from Main.

	>>
	Fix for https://jira.it.epicgames.net/browse/OR-42337 and https://jira.it.epicgames.net/browse/OR-42338
	Don't call UpdateMontageSyncGroup() when doing EMeshComponentUpdateFlag::OnlyTickMontagesWhenNotRendered.
	Fixed auto ranged iterator.

	#!rb none
	#!tests bot match with Twinblast
	<<

Change 3590263 on 2017/08/16 by Matt.Kuhlenschmidt

	Added the ability to remove vertex colors from static meshes from the content browser

	#!rb none
	#!tests none
	#!fyi jordan.walker

Change 3590026 on 2017/08/16 by Jurre.deBaare

	HLOD: When mesh has auto LOD generation disabled it prevents user from dragging meshes to make a cluster
	#!fix changed the tooltip and error handling for cluster creation, if there is any valid mesh now it will show up as a warning
	#!jira OR-41584
	#!rb none
	#!test have tested several 'error' meshes which would before prevent the user from creating a cluster,

Change 3588580 on 2017/08/15 by Laurent.Delayen

	Fix for https://jira.it.epicgames.net/browse/OR-42755

	#!rb none
	#!tests bot match

Change 3588360 on 2017/08/15 by Charles.Anderson

	Phat
	- Fixed up the materials to turn off the Render Before DOF so that we can see what were doing in Phat again.

Change 3587983 on 2017/08/15 by robomerge

	#!ROBOMERGE-AUTHOR: daniel.lamb
	Fixed up audio issue on the new dawn intro movie
	#!jira OR-42144
	#!rb Max.Preussner
	#!test Paragon ps4
	#!lockdown Andrew.Grant

	#!ROBOMERGE-SOURCE: CL 3581466 in //Orion/Release-42.1/... via CL 3581468 via CL 3581469
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3587746 on 2017/08/15 by Daniel.Lamb

	Build launcher now has option for custom test.
	Dumps generated buildcooktest commandline to log when using -interactive for reference.
	#!rb trivial
	#!test BuildCookTest with and without test options.

Change 3587733 on 2017/08/15 by Daniel.Lamb

	Reenabled binned 2 stats in not shipping.
	#!rb Andrew.Grant
	#!test Paragon editor.

Change 3587727 on 2017/08/15 by Daniel.Lamb

	Removed all the checks to help track down Texture GC issue.
	#!rb Trivial
	#!test Paragon editor

Change 3584487 on 2017/08/14 by Laurent.Delayen

	https://jira.it.epicgames.net/browse/OR-42754 making sure this is not firing because of false positives.

	#!rb none
	#!tests compiles

Change 3582074 on 2017/08/11 by Laurent.Delayen

	TimeStretchCurve system for AnimMontages.

	Allows adjusting playback time of montages in a non constant way. This optional curve allows the user to determine how animation frames are influenced by play back time scaling, instead of using a constant play rate scaling.
	For example, with an attack animation, the strike could have zero influence (no play rate), and the recovery time could have 100% influence (most play rated).

	This system is entirely optional and compatible with current Montage API. You still determine desired play back time via the Play Rate parameter. Based on desired playback time, if there is a curve named 'MontageTimeStretchCurve' then, it will use the curve to determine animation frames to play based on playback time and TimeStretchCurve. Otherwise, if no curve exists, it is done using the constant supplied PlayRate.

	#!rb martin.wilson
	#!codereview lina.halper, james.golding
	#!tests wukong primary attacks

Change 3582063 on 2017/08/11 by Brian.Fasten

	Removing Monolith02_LowTest from automated builds until errors can be cleared
	#!codereview: daniel.lamb
	#!rb - none
	#!tests - none

Change 3581229 on 2017/08/10 by Lina.Halper

	- Back out revision 21 from //Orion/Dev-General/Engine/Source/Runtime/SlateCore/Private/Rendering/DrawElements.cpp
	- Comment out issue that causes crash in the draw box

	#!jira: UE-48222
	#!code review: Jurre.DeBaare, Nick.Darnell, Daniel.Lamb
	#!rb: Jurre.DeBaare
	#!tests: building HLOD as specified in the ticket, and anim blueprint graph

Change 3577839 on 2017/08/08 by Daniel.Lamb

	Revert CL 3576931. To fix crash when generating HLOD in Monolith 2.
	#!rb Andrew.Grant
	#!test Rebuild HLOD paragon editor
	#!fyi Lina.Halper

Change 3577684 on 2017/08/08 by Andrew.Grant

	Removed ensure and merged proper fix for crash from UE4/Main (3572777)

	#!tests #!rb none

Change 3577562 on 2017/08/08 by robomerge

	#!ROBOMERGE-AUTHOR: laurent.delayen
	Potential fix for https://jira.it.epicgames.net/browse/OR-42383
	Clear NotifyQueue prior to ticking montages. Also dispatch events right away, since ticking ends here, and no rendering is happening. In the event TickPose() is called directly and Component does not get ticked.

	#!rb lina.halper
	[CODEREVIEW] lina.halper, martin.wilson
	#!tests bot match

	#!ROBOMERGE-SOURCE: CL 3577071 in //Orion/Main/...
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3577358 on 2017/08/08 by Harrison.Moore

	Updating Colorchecker

Change 3576931 on 2017/08/08 by Lina.Halper

	Fix for missing arrowhead of the transition on state machine graph

	#!rb: Nick.Darnell
	#!tests: editor

Change 3576847 on 2017/08/08 by Jason.Bestimt

	#!ORION_DG - OR-42361 - Removing assert that was causing crash report client to break (during shipping builds of Paragon due to directories that didn't exist)

	#!RB: Guillaume.Abadie
	#!Tests:none

Change 3576794 on 2017/08/08 by Laurent.Delayen

	Removed call to DebugCanvas->Flush_GameThread(); to fix 'showdebug' commands not rendering anymore.

	#!rb Matt.Kuhlenschmidt
	#!codereview Matt.Kuhlenschmidt
	#!tests Ghost in PIE, showdebug animation works.

Change 3576302 on 2017/08/08 by Jurre.deBaare

	Fix for Materials get switched up while building HLODs in case the section order is different than the material order
	#!rb none
	#!tests Rebuild problematic clusters in Monolith2
	#!fix materials remapping was done using the section index instead of material index in the hlod path (static mesh merge one was fine)

Change 3575221 on 2017/08/07 by robomerge

	#!ROBOMERGE-AUTHOR: andrew.grant
	Fix for PS4 shipping

	#!tests compiled PS4 shipping
	#!rb none

	#!ROBOMERGE-SOURCE: CL 3575112 in //Orion/Release-42.1/... via CL 3575114
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3575165 on 2017/08/07 by andrew.grant

	#!CodeReview: andrew.grant, jason.bestimt, jeff.williams

	Unresolved conflicts. andrew.grant, please merge this change by hand.
	//ROBOMERGE_ORION_Dev_General/Engine/Source/Runtime/PS4/PS4RHI/Private/GnmManager.cpp

	--------------------------------------
	PS4 GPU time now shows correct values instead of vsync time.

	#!tests Ran on PS4
	#!rb Luke.Thatcher

	#!ROBOMERGE-SOURCE: CL 3574821 in //Orion/Release-42.1/... via CL 3574823
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3574408 on 2017/08/06 by Ben.Salem

	Switch nightly solo smoke/fx tests to have -unattended on their commandlines.
	#!rb none
	#!tests compiled.

Change 3574308 on 2017/08/06 by robomerge

	#!ROBOMERGE-AUTHOR: andrew.grant
	Include session time, MVP, and hitches on new health report

	#!tests ran locally
	#!rb none

	#!ROBOMERGE-SOURCE: CL 3574305 in //Orion/Release-42/... via CL 3574306 via CL 3574307
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3574217 on 2017/08/05 by Jeff.Williams

	Fixing UAT compile error

	#!review-3574218 @andrew.grant
	#!rb na
	#!tests na

Change 3574139 on 2017/08/05 by robomerge

	#!ROBOMERGE-AUTHOR: andrew.grant
	[NULL MERGE]
	Locked net version to 3571982 for future v42 patches

	#!tests #!rb none

	#!ROBOMERGE-SOURCE: CL 3574136 in //Orion/Release-42/... via CL 3574137 via CL 3574138
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3574130 on 2017/08/05 by andrew.grant

	#!CodeReview: andrew.grant, jason.bestimt, jeff.williams

	Unresolved conflicts. andrew.grant, please merge this change by hand.
	//ROBOMERGE_ORION_Dev_General/Engine/Source/Programs/AutomationTool/NotForLicensees/Gauntlet/SelfTest/Gauntlet.SelfTest.LogParserTest.cs

	--------------------------------------
	Non-shipping Gauntlet changes -
	 Log parser cleanup that provides better access to log channel info, errors, warnings, and ensures
	 Updated BaselinePerf test to record number of units travelled. This should highlight tests where a bot gets blocked :(

	#!tests ran locally on PS4
	#!rb none

	#!ROBOMERGE-SOURCE: CL 3574116 in //Orion/Release-42/... via CL 3574123 via CL 3574124
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3573197 on 2017/08/04 by andrew.grant

	#!CodeReview: andrew.grant, jason.bestimt, jeff.williams

	Unresolved conflicts. andrew.grant, please merge this change by hand.
	//ROBOMERGE_ORION_Dev_General/Engine/Source/Programs/AutomationTool/NotForLicensees/Gauntlet/Gauntlet.Automation.csproj

	--------------------------------------
	Merging //Orion/Release-42.1 to Dev-ContentUpdate (//Orion/Dev-ContentUpdate)
	#!tests #!rb none

	#!ROBOMERGE-SOURCE: CL 3573179 in //Orion/Main/...
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3573079 on 2017/08/04 by Andrew.Grant

	Removed some code that was preventing Wacom from working
	#!tests #!rb none

Change 3572790 on 2017/08/04 by Jurre.deBaare

	Moving over fixes from 4.17 stream related to HLOD:
	"UE-47360
	Non Uniform baking of HLOD materials causes texture stretching
	UE-47031
	Generating a HLOD cluster with multiple actors that contain lods will not bake correctly"
	#!rb none
	#!tests none

Change 3572663 on 2017/08/04 by robomerge

	#!ROBOMERGE-AUTHOR: andrew.grant
	Gauntlet - copy elf files to temp dir and launch from there

	#!tests ran gauntlet
	#!rb none

	#!ROBOMERGE-SOURCE: CL 3572657 in //Orion/Release-42/... via CL 3572659 via CL 3572662
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3572622 on 2017/08/04 by Jurre.deBaare

	Moving over:

	"Guard against zero sized boxes being sent to the slate batcher.  This was exposed by the clipping changes since zero sized elements would have been previously clipped.

	#!rb nick.darnell
	#!jira UE-46919"

	#!tests none

Change 3572428 on 2017/08/04 by Benn.Gallagher

	Added per-axis inertia and parent dominance settings to physics assets
	#!rb Thomas.Sarkanen
	#!tests Shrapnel in editor and -game (seems to be the only character using old inertia scaler for rigid body node)

Change 3572142 on 2017/08/04 by robomerge

	#!ROBOMERGE-AUTHOR: andrew.grant
	Disabling r.Cache.UpdatePrimsTaskEnabled  for PS4 due to lock-ups

	#!tests none
	#!rb none

	#!ROBOMERGE-SOURCE: CL 3572139 in //Orion/Release-42/... via CL 3572140 via CL 3572141
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3572133 on 2017/08/04 by Andrew.Grant

	Merging

	//UE4/Main/Engine/Source/Runtime/SlateCore/Private/Input/HittestGrid.cpp

	to //Orion/Dev-General/Engine/Source/Runtime/SlateCore/Private/Input/HittestGrid.cpp

	#!tests #!rb none

Change 3572065 on 2017/08/03 by Andrew.Grant

	Fixed bug in Gauntlet parsing of perf data for tests
	Added perf-parsing test to SelfTest

	#!tests ran self test
	#!rb none
	#!ROBOMERGE: 42.1

Change 3572033 on 2017/08/03 by Andrew.Grant

	Merging //UE4/Main @ 3571062 through Orion-Staging

	#!rb none
	#!tests Engine QA pass

Change 3571262 on 2017/08/03 by Uriel.Doyon

	StaticMeshComponent and LandscapeComponent now register AO material mask and sky occlusion texture in the texture streamer.
	Changing the current lighting scenario now triggers an update of the texture streamer.
	Added an option to the "liststreamingtextures" named UNKOWNREF allowing to inspect texture without references in the texture streamer.
	#!rb none
	#!tests played monolith2 on PS4 and loaded the map in the editor.

Change 3571247 on 2017/08/03 by robomerge

	#!ROBOMERGE-AUTHOR: daniel.lamb
	Integrate Dev-UI -> Release42

	Reduced the sensitivity on the slow tick timer warning
	#!rb Trivial
	#!test Cooked paragon ps4
	#!lockdown Andrew.Grant

	#!ROBOMERGE-SOURCE: CL 3571239 in //Orion/Release-42/... via CL 3571244 via CL 3571246
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3570431 on 2017/08/03 by robomerge

	#!ROBOMERGE-AUTHOR: andrew.grant
	Removed a change that was inadvertendly included in a larger fix and seems to be having problems on windows server.

	#!tests ran windows server locally
	#!rb none

	#!ROBOMERGE-SOURCE: CL 3570428 in //Orion/Release-42/... via CL 3570429 via CL 3570430
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3570343 on 2017/08/03 by Jurre.deBaare

	HLOD: opening a level with HLOD defaults to forcing HLOD on for all clusters
	#!fix forcing the HLODs to show up in the editor changes the MinDrawDistance of the static mesh component, this was getting saved and not restored during runtime (now does it in PostLoad)
	#!jira UE-47712
	#!rb none
	#!tests PIE in Editor while having HLOD forced on

Change 3570047 on 2017/08/02 by robomerge

	#!ROBOMERGE-AUTHOR: andrew.grant
	Fix for ensure leading to deadlock

	#!jira OR-42071
	#!tests compiled, ran ShortSoloGame test
	#!rb none
	[QAREVIEW] - this fixes the PC locks in OR-42071 and probably the PS4 too, but please recheck both platforms to be sure.

	#!ROBOMERGE-SOURCE: CL 3570044 in //Orion/Release-42/... via CL 3570045 via CL 3570046
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3569932 on 2017/08/02 by robomerge

	#!ROBOMERGE-AUTHOR: andrew.grant
	Integration from UE4 - fixed a set of critical bugs that would cause rare crashes in the  async IO subsystems.

	#!rb gil.gribb
	#!tests ran 10x solo games, ran LoadTest, all PS4
	#!jira UE-47483

	#!ROBOMERGE-SOURCE: CL 3569929 in //Orion/Release-42/... via CL 3569930 via CL 3569931
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3569839 on 2017/08/02 by Daniel.Lamb

	Added the low quality monolith map to the build launcher and cook maps list.
	#!rb Trivial
	#!test Compile UAT

Change 3569441 on 2017/08/02 by robomerge

	#!ROBOMERGE-AUTHOR: laurent.delayen
	Re-enabled OnlyTickMontagesWhenNotRendered animation optimization, after fixing edge case where 'Evaluate' could be called on out of sync cached data.
	Only update cached data when the graph will be updated, to ensure we don't have mismatching update and evaluate data.

	#!rb none
	[CODEREVIEW] martin.wilson, lina.halper
	#!tests bot match w/ dedicated server.

	#!ROBOMERGE-SOURCE: CL 3569235 in //Orion/Main/...
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3569397 on 2017/08/02 by robomerge

	#!ROBOMERGE-AUTHOR: ben.salem
	Merging using Dev-Gen_->_Release-42.1 Support for skins in perf reporting, also report overall test run time.
	#!rb various
	#!tests ran with new shallow test maps.

	#!ROBOMERGE-SOURCE: CL 3568892 in //Orion/Release-42.1/... via CL 3568967
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3568639 on 2017/08/02 by Adric.Worley

	Add individual FTest enumeration to Orion perf tests

	Moved methods to run FTests to helper for reuse.
	Effects perf tests now show individual test cases for more granular runs.
	All perf tests now do map check and draft logic as setup.

	#!tests ran updated tests in client/server
	#!rb ben.salem

Change 3568616 on 2017/08/02 by Ben.Salem

	Switch shallow fx tests to report to their own mailing list.
	#!rb bob.ferreira
	#!tests recompiled

Change 3568607 on 2017/08/02 by Daniel.Lamb

	Added staticmeshcomponent to the memreportfull command.
	#!rb Trivial
	#!test Paragon

Change 3568018 on 2017/08/01 by Ben.Salem

	Add skin and character name to test reports, and also test runtime.
	#!rb none
	#!tests ran steel shallow test

Change 3567995 on 2017/08/01 by Bob.Ferreira

	[FXTests] Updating FXTests and ShallowFXTests to call OnComplete() when doing check point validation.
	[Gauntlet] Changed InnerTestResult to be protected so that inherited test nodes can modify it.
	#!rb Ben.Salem
	#!TESTS Ran local automationtool run on a cooked main build.

Change 3567912 on 2017/08/01 by robomerge

	#!ROBOMERGE-AUTHOR: ori.cohen
	Added support for physical materials in immediate mode

	#!rb none
	#!tests none
	[CODEREVIEW] Benn.Gallagher

	#!ROBOMERGE-SOURCE: CL 3567865 in //Orion/Release-42/... via CL 3567901 via CL 3567904
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3567594 on 2017/08/01 by robomerge

	#!ROBOMERGE-AUTHOR: laurent.delayen
	Disabling animation optimization until I can fix an edge case.

	#!rb none
	#!tests arcade mode

	#!ROBOMERGE-SOURCE: CL 3567593 in //Orion/Main/...
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3566953 on 2017/08/01 by robomerge

	#!ROBOMERGE-AUTHOR: laurent.delayen
	Animation Optimization: Added EMeshComponentUpdateFlag::OnlyTickMontagesWhenNotRendered to only update montages when not rendered, instead of doing a whole pose update. This means on dedicated servers we'll only update montages when needed, and not the AnimGraph, which we have no need for.
	This is also affects non rendered meshes on clients.

	#!rb martin.wilson
	[CODEREVIEW] lina.halper, martin.wilson
	#!tests ghost and wukong networked doing montage abilities.

	#!ROBOMERGE-SOURCE: CL 3566950 in //Orion/Main/...
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

Change 3564610 on 2017/07/31 by Uriel.Doyon

	Integrated CL 3543210 : Fixed an issue when computing material scales where the default material ends up being used instead of the required material.
	Deprecated previous material data as it was causing some waste.
	Integrated CL 3526859 : Texture mip bias is now reset whenever the streaming budget increases
	#!rb none
	#!tests played monolith2 on PS4

Change 3564509 on 2017/07/31 by robomerge

	#!ROBOMERGE-AUTHOR: laurent.delayen
	Fixed warning when opening Kwang AnimBP the first time, due to missing virtual bone name. (When Skeleton doesn't have PostLoad() called on it yet - happens only the first time the AnimBP is opened).

	[CODEREVIEW] jurre.debaare, dwayne.martin, lina.halper, martin.wilson
	#!rb none
	#!tests Kwang AnimBP opens without a warning.

	#!ROBOMERGE-SOURCE: CL 3564506 in //Orion/Release-42/... via CL 3564507
	#!ROBOMERGE-BOT: ORION (Main -> Dev-General)

[CL 3613306 by Andrew Grant in Main branch]
2017-08-28 15:13:54 -04:00