2013-08-19: typo erased
Merge branch 'kreincke' into integration
Merge branch 'integration'