fixes #262, adding dust on server side
rel notes
rel notes
merge master