Re-release under Apache v2