merge 39500 39495 39492 39493 39499 39494 39497 39498 39496
thanks

Looks like I haven't mastered `git send-email` yet :P

Sorry for this mess,
Jakub Kądziołka