updating ormwtf
Merge branch 'trunk'