+1 proposal for Berlin 2014.
Merge pull request #1028 from jbraeuer/master

+1 proposal for Berlin 2014.