Peter Svanberg - 2014-03-10

Duplicate of #424, sorry.