upstream/5.3.6+dfsg1

David Bremner

@bremner

a4544d6e · Merge tag 'upstream/5.3.6' into dfsg · Jan 01, 2014

a few non-free items removed from 5.3.6