merge latest into neonrain