Version from 29.07.14
Merge branch 'entw'