intranda 2013 09

This is a pull request for changes by intranda GmbH made in September containing two commits.
It appears this cannot be merged automatically by GitHub, possibly due to line ending changes. We will introduce a .gitattributes with text=auto normalization in our repositories soon.