Merge proposals dependent on lp:~neon/kruler/master

lp:~neon/kruler/master has no merge proposals.