SpeeDRF changes #1 - porting again my changes from Friday/weekend into
master (since it is impossible to merge my changes).
SpeeDRF changes #2 - porting again my changes from Friday/weekend into
master