Merge tag 'v3.10.13' into mptcp_v0.87

This is the 3.10.13 stable release

Signed-off-by: Christoph Paasch <christoph.paasch@uclouvain.be>

Conflicts:
	net/ipv4/tcp_input.c