Emptied branch 1.x -- moved to 3.x to reflect omega