Updated for 4.0 beta 4
3 files changed