Merge branches 'stable/balloon.cleanup' and 'stable/general.cleanup' of git://git...