2013-03-07: review of greg adopted
2013-03-07: do not only modify, but also don't forget to communicate the results ;-)
Merge branch 'kreincke' into integration
Merge branch 'integration'