Berlin 2014: +1 proposal
Merge pull request #1126 from jbraeuer/master

Berlin 2014: +1 proposal