The last of the proposals maybe
Merge pull request #865 from rberger/sv_14_05_16_00

The last of the proposals maybe