wip/flam3-svn/patches
