Berlin 2013: Martin Alfke's proposal.
Merge remote-tracking branch 'jedi4ever/master'
Merge pull request #184 from jbraeuer/master

Berlin 2013: +1 proposal.