SRB2 2.1.7 release
Merge remote-tracking branch 'upstream/master'