Import from SVN

Signed-off-by: Lukas Schmid <lschmid@hsr.ch>