Updates from thinktecture:master