Merge tag '3.1.5' into 3.1

Tagged 3.1.5