Merge branch 'kreincke' into integration
Merge branch 'kreincke' into integration
Merge branch 'kreincke' into integration
2013-05-20: fixed size (little typo of the last minute)
Merge branch 'kreincke' into integration
Merge branch 'integration'