Fixed null issue
Merge remote-tracking branch 'origin/master'

Conflicts:
	ObjectHydrator/Properties/AssemblyInfo.cs