Merge tag 'upstream/1.2.1'

Upstream version 1.2.1
Bump Standards-Version to 3.9.5, no changes necessary
Update changelog for 1.2.1-1~1.gbpcd153b release