Fixed build.
Merge branch 'windsor'