Merge pull request #184 from jbraeuer/master

Berlin 2013: +1 proposal.
removed inside s3 ignite for now
Berlin 2013: Remove withdrawn proposal.