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

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