support for motor and pulsar servers, thanks Niphlod
Merge remote-tracking branch 'upstream/master'