Conflicts:
	src/Compilers/CSharp/Portable/Binder/Binder_Conversions.cs
	src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/ConversionKind.cs
	src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/ConversionKindExtensions.cs
	src/Compilers/CSharp/Portable/CodeGen/EmitExpression.cs