Import from SVN

Signed-off-by: Hans Spaans <hans@dailystuff.nl>
Release 15

Signed-off-by: Hans Spaans <hans@dailystuff.nl>