Merge tag '1.2.0' into debian
authorKeith Packard <keithp@keithp.com>
Mon, 30 May 2016 19:48:05 +0000 (12:48 -0700)
committerKeith Packard <keithp@keithp.com>
Mon, 30 May 2016 19:48:05 +0000 (12:48 -0700)

Trivial merge