Merging latest from Thinktecture into my branch