2013-06-18: minor debugging
Merge branch 'kreincke' into integration
Merge branch 'integration'