Intranda 2013 08

This is a pull request for recent changes by intranda. Currently this cannot be automatically merged, but after applying changes like it has been done in the integrate-intranda-master branch and finishing the first pull request this should be fairly easy to integrate. This branch only has a limited amount of changes on top of intranda-master.