Comment 4 for bug 1527685

There was some confusion with duplicate work between kickinz1 and tdaitx on this due to some lost messages between them. I'm uploading Steve's merge as that seems good to me (I've not done a full review but Steve is an uploader anyway) and has been agreed by kickinz1 and tdaitx. See http://irclogs.ubuntu.com/2016/01/08/%23ubuntu-devel.html#t13:54