Proposal by Andi Mann (Berlin 2014).
Merge pull request #992 from jbraeuer/master

Proposal by Andi Mann (Berlin 2014).