updated to support the latest beta 4.1.12