Merge branch '3.1.5-patch' into 3.1.6-patch
MINOR: Fixed copyright year
Merge remote-tracking branch 'upstream/3.1' into 3.1
Merge branch '3.1.6-patch' into 3.1