Berlin 2014: Fix registration.
Merge pull request #1100 from jbraeuer/master

Berlin 2014: Fix registration.