...
Merge commit '2419ccdf7f1f3b61312fcd0b8e6a8379fcbcd4b0'
Merge commit '18bd1ad2074ce53216b7f6f8cccfccf6178a9b80'

Conflicts:
	$external/ProxyGenerator/.gitignore
Merge commit '0c5dcd3a2b4cfe8005601e5933ad410cb7a8cee5'