merging in changes from using ZopeSkel