Merge branch 'touch_carousel'
Text from Trine
Merge branch 'master' into touch_carousel