Merge proposals dependent on lp:~christopher-bradshaw-b/tiqit/attr

lp:~christopher-bradshaw-b/tiqit/attr has no merge proposals.