Berlin 2014: Change program.
Merge pull request #1291 from jbraeuer/master

Berlin 2014: Change program.