.
.
Merge branch 'master' of github.com:simul/ue4

Conflicts:
	Engine/Plugins/TrueSkyPlugin/Source/TrueSkyPlugin/Private/TrueSkyPlugin.cpp