Merge proposals dependent on lp:~darksun/nerdbot/trunk

lp:~darksun/nerdbot/trunk has no merge proposals.