Merge proposals dependent on lp:~romaia/pydojo/working

lp:~romaia/pydojo/working has no merge proposals.