2013-08-01: release 0.97.1
Merge branch 'kreincke' into integration
Merge branch 'integration'