GTK merge of trunk code.

[Aidan Kehoe]

Hi Jeff,

I’ve gone and merged the recent trunk changes into the GTK repository; if
you have local work that that interferes with, feel free to point me towards
to do the extra merge work myself.

Best,

Aidan

-- 
‘Iodine deficiency was endemic in parts of the UK until, through what has been
described as “an unplanned and accidental public health triumph”, iodine was
added to cattle feed to improve milk production in the 1930s.’
(EN Pearce, Lancet, June 2011)