fixes #61
Merge remote-tracking branch 'origin/master' into Next

Conflicts:
	LightInject/LightInject.cs