2013-03-06: changes updated
Merge branch 'kreincke' into integration
Merge branch 'integration'