FeinCMS v1.7 only, but fixes all open issues (#15, #28)