intranda 2013 10

This is a pull request for changes by intranda GmbH made in October.
This again cannot be merged automatically, line ending normalization has been introduced recently though.