proposal Kevin Behr
Merge pull request #1144 from rgevaert/master

[belgium 2014] proposal Kevin Behr