Update master after release 3.2.4.

@phgross review :)